From 02f3887af59670eed960a1578f21dc9e1840d70c Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Sat, 7 Jan 2012 16:07:19 +0000
Subject: [PATCH] BETA: Datapack refactoring: * Using same Code
warning/error configuration than core. * Fixed respective warnings
and errors. * Fixing Extractable Skills restriction properly.
1. Unhardcode Skills Ids. 1. Now only Item Skills are
restricted. 1. Items with consume count won't be consumed without
giving the reward. 1. Applied to reuse time greater than 5
seconds, there is no point on restrict item skills with less reuse time.
1. Unhardcoded system message for item reward. * Hellbound fixes:
1. Hellbound should start closed at server start (level 0), thanks
Trev. 1. Quarry ClassCastException fix. * Q290_ThreatRemoval
removed unnecessary int cast. * Q636_TruthBeyond proper method to get an
int. * Skill Santa Claus' Gift - Luck(22018) typo fix.
---
.../.settings/org.eclipse.jdt.core.prefs | 36 +-
.../.settings/org.eclipse.jdt.ui.prefs | 3 +-
.../scripts/ai/group_template/BeastFarm.java | 9 +-
.../ai/group_template/FeedableBeasts.java | 6 +-
.../data/scripts/ai/individual/Beleth.java | 43 +-
.../scripts/ai/individual/IceFairySirra.java | 38 +-
.../FortressOfResistance.java | 1 +
.../FortressOfTheDead/FortressOfTheDead.java | 1 +
.../scripts/custom/MissQueen/MissQueen.java | 74 +--
.../custom/NewbieCoupons/NewbieCoupons.java | 6 +-
.../scripts/events/HeavyMedal/HeavyMedal.java | 3 +-
.../L2ArtefactInstanceAction.java | 2 +
.../actionhandlers/L2DecoyAction.java | 2 +
.../actionhandlers/L2DoorInstanceAction.java | 2 +
.../L2DoorInstanceActionShift.java | 2 +
.../actionhandlers/L2ItemInstanceAction.java | 2 +
.../L2ItemInstanceActionShift.java | 2 +
.../handlers/actionhandlers/L2NpcAction.java | 2 +
.../actionhandlers/L2PcInstanceAction.java | 2 +
.../actionhandlers/L2PetInstanceAction.java | 2 +
.../L2StaticObjectInstanceAction.java | 2 +
.../L2StaticObjectInstanceActionShift.java | 2 +
.../actionhandlers/L2SummonAction.java | 2 +
.../handlers/actionhandlers/L2TrapAction.java | 2 +
.../admincommandhandlers/AdminBBS.java | 2 +
.../admincommandhandlers/AdminBan.java | 16 +-
.../admincommandhandlers/AdminBuffs.java | 16 +-
.../admincommandhandlers/AdminCache.java | 2 +
.../admincommandhandlers/AdminCamera.java | 2 +
.../AdminChangeAccessLevel.java | 2 +
.../AdminCursedWeapons.java | 2 +
.../admincommandhandlers/AdminDebug.java | 2 +
.../admincommandhandlers/AdminDelete.java | 2 +
.../admincommandhandlers/AdminDisconnect.java | 2 +
.../AdminDoorControl.java | 2 +
.../admincommandhandlers/AdminEditChar.java | 68 +--
.../admincommandhandlers/AdminEffects.java | 7 +-
.../admincommandhandlers/AdminElement.java | 2 +
.../admincommandhandlers/AdminEnchant.java | 2 +
.../AdminEventEngine.java | 2 +
.../admincommandhandlers/AdminEvents.java | 18 +-
.../admincommandhandlers/AdminExpSp.java | 96 ++--
.../AdminFightCalculator.java | 2 +
.../admincommandhandlers/AdminFortSiege.java | 2 +
.../admincommandhandlers/AdminGeoEditor.java | 3 +-
.../admincommandhandlers/AdminGeodata.java | 3 +-
.../admincommandhandlers/AdminGm.java | 3 +-
.../admincommandhandlers/AdminGmChat.java | 2 +
.../AdminGraciaSeeds.java | 3 +-
.../admincommandhandlers/AdminHelpPage.java | 2 +
.../admincommandhandlers/AdminInstance.java | 43 +-
.../AdminInstanceZone.java | 2 +
.../admincommandhandlers/AdminInvul.java | 2 +
.../admincommandhandlers/AdminKill.java | 7 +-
.../admincommandhandlers/AdminLevel.java | 4 +-
.../admincommandhandlers/AdminLogin.java | 4 +-
.../admincommandhandlers/AdminMammon.java | 2 +
.../admincommandhandlers/AdminManor.java | 2 +
.../admincommandhandlers/AdminMobGroup.java | 3 +
.../AdminMonsterRace.java | 4 +
.../admincommandhandlers/AdminPForge.java | 2 +
.../admincommandhandlers/AdminPathNode.java | 2 +
.../admincommandhandlers/AdminPetition.java | 3 +-
.../admincommandhandlers/AdminPledge.java | 2 +
.../admincommandhandlers/AdminPolymorph.java | 4 +-
.../admincommandhandlers/AdminQuest.java | 2 +
.../admincommandhandlers/AdminRepairChar.java | 2 +
.../admincommandhandlers/AdminRes.java | 2 +
.../admincommandhandlers/AdminRide.java | 2 +
.../admincommandhandlers/AdminShop.java | 2 +
.../admincommandhandlers/AdminShowQuests.java | 15 +-
.../admincommandhandlers/AdminShutdown.java | 2 +
.../admincommandhandlers/AdminSiege.java | 2 +
.../admincommandhandlers/AdminSkill.java | 54 +-
.../admincommandhandlers/AdminSpawn.java | 5 +-
.../admincommandhandlers/AdminTarget.java | 2 +
.../admincommandhandlers/AdminTargetSay.java | 20 +-
.../admincommandhandlers/AdminTeleport.java | 4 +-
.../admincommandhandlers/AdminTest.java | 6 +-
.../admincommandhandlers/AdminTvTEvent.java | 2 +
.../admincommandhandlers/AdminUnblockIp.java | 7 +-
.../admincommandhandlers/AdminVitality.java | 9 +-
.../handlers/bypasshandlers/Festival.java | 538 +++++++++---------
.../handlers/bypasshandlers/FortSiege.java | 6 +-
.../bypasshandlers/OlympiadObservation.java | 37 +-
.../bypasshandlers/RemoveDeathPenalty.java | 5 +-
.../handlers/bypasshandlers/SupportMagic.java | 3 +
.../handlers/chathandlers/ChatAll.java | 2 +-
.../handlers/chathandlers/ChatAlliance.java | 4 +-
.../chathandlers/ChatBattlefield.java | 2 +-
.../handlers/chathandlers/ChatClan.java | 4 +-
.../handlers/chathandlers/ChatHeroVoice.java | 2 +-
.../handlers/chathandlers/ChatParty.java | 4 +-
.../chathandlers/ChatPartyMatchRoom.java | 3 +
.../chathandlers/ChatPartyRoomAll.java | 4 +-
.../chathandlers/ChatPartyRoomCommander.java | 4 +-
.../handlers/chathandlers/ChatPetition.java | 4 +-
.../handlers/chathandlers/ChatShout.java | 2 +-
.../handlers/chathandlers/ChatTell.java | 4 +-
.../handlers/chathandlers/ChatTrade.java | 2 +-
.../handlers/effecthandlers/Fusion.java | 2 +
.../handlers/itemhandlers/BeastSoulShot.java | 3 +-
.../handlers/itemhandlers/BeastSpice.java | 3 +-
.../itemhandlers/BeastSpiritShot.java | 3 +-
.../itemhandlers/BlessedSpiritShot.java | 3 +-
.../scripts/handlers/itemhandlers/Book.java | 3 +-
.../handlers/itemhandlers/ChristmasTree.java | 3 +-
.../handlers/itemhandlers/Disguise.java | 3 +-
.../scripts/handlers/itemhandlers/Elixir.java | 2 +-
.../itemhandlers/EnchantAttribute.java | 1 +
.../handlers/itemhandlers/EnchantScrolls.java | 3 +-
.../itemhandlers/EnergyStarStone.java | 2 +-
.../handlers/itemhandlers/EventItem.java | 2 +-
.../itemhandlers/ExtractableItems.java | 1 +
.../handlers/itemhandlers/FishShots.java | 3 +-
.../handlers/itemhandlers/Harvester.java | 3 +-
.../handlers/itemhandlers/ItemSkills.java | 2 +-
.../itemhandlers/ItemSkillsTemplate.java | 15 +-
.../handlers/itemhandlers/ManaPotion.java | 2 +-
.../scripts/handlers/itemhandlers/Maps.java | 3 +-
.../handlers/itemhandlers/NicknameColor.java | 1 +
.../handlers/itemhandlers/PaganKeys.java | 3 +-
.../handlers/itemhandlers/PetFood.java | 15 +-
.../handlers/itemhandlers/Recipes.java | 1 +
.../handlers/itemhandlers/RollingDice.java | 3 +-
.../itemhandlers/ScrollOfResurrection.java | 3 +-
.../scripts/handlers/itemhandlers/Seed.java | 3 +-
.../itemhandlers/SevenSignsRecord.java | 3 +-
.../handlers/itemhandlers/SoulShots.java | 1 +
.../handlers/itemhandlers/SpecialXMas.java | 3 +-
.../handlers/itemhandlers/SpiritShot.java | 3 +-
.../handlers/itemhandlers/SummonItems.java | 5 +-
.../itemhandlers/TeleportBookmark.java | 2 +-
.../handlers/skillhandlers/BallistaBomb.java | 2 +
.../handlers/skillhandlers/BeastSkills.java | 2 +
.../scripts/handlers/skillhandlers/Blow.java | 2 +
.../handlers/skillhandlers/Charge.java | 2 +
.../handlers/skillhandlers/Continuous.java | 2 +
.../scripts/handlers/skillhandlers/CpDam.java | 2 +
.../handlers/skillhandlers/CpDamPercent.java | 2 +
.../scripts/handlers/skillhandlers/Craft.java | 2 +
.../handlers/skillhandlers/DeluxeKey.java | 2 +
.../handlers/skillhandlers/Detection.java | 2 +
.../handlers/skillhandlers/Disablers.java | 4 +-
.../handlers/skillhandlers/Extractable.java | 86 +--
.../handlers/skillhandlers/Fishing.java | 2 +
.../handlers/skillhandlers/FishingSkill.java | 2 +
.../handlers/skillhandlers/GetPlayer.java | 2 +
.../handlers/skillhandlers/GiveReco.java | 2 +
.../handlers/skillhandlers/GiveSp.java | 2 +
.../handlers/skillhandlers/GiveVitality.java | 2 +
.../handlers/skillhandlers/Harvest.java | 4 +
.../handlers/skillhandlers/InstantJump.java | 2 +
.../handlers/skillhandlers/ManaHeal.java | 2 +
.../handlers/skillhandlers/Manadam.java | 2 +
.../scripts/handlers/skillhandlers/Mdam.java | 2 +
.../handlers/skillhandlers/NornilsPower.java | 2 +
.../scripts/handlers/skillhandlers/Pdam.java | 2 +
.../handlers/skillhandlers/RefuelAirShip.java | 2 +
.../handlers/skillhandlers/Resurrect.java | 2 +
.../handlers/skillhandlers/ShiftTarget.java | 2 +
.../scripts/handlers/skillhandlers/Soul.java | 2 +
.../scripts/handlers/skillhandlers/Sow.java | 2 +
.../scripts/handlers/skillhandlers/Spoil.java | 2 +
.../handlers/skillhandlers/StealBuffs.java | 2 +
.../skillhandlers/StrSiegeAssault.java | 2 +
.../handlers/skillhandlers/SummonFriend.java | 2 +
.../scripts/handlers/skillhandlers/Sweep.java | 2 +
.../handlers/skillhandlers/TakeCastle.java | 2 +
.../handlers/skillhandlers/TakeFort.java | 2 +
.../skillhandlers/TransformDispel.java | 2 +
.../scripts/handlers/skillhandlers/Trap.java | 2 +
.../handlers/skillhandlers/Unlock.java | 34 +-
.../targethandlers/TargetCorpsePlayer.java | 3 +-
.../targethandlers/TargetPartyMember.java | 8 +-
.../targethandlers/TargetPartyOther.java | 18 +-
.../targethandlers/TargetUnlockable.java | 3 +-
.../handlers/telnethandlers/DebugHandler.java | 5 +-
.../usercommandhandlers/Birthday.java | 5 +-
.../usercommandhandlers/ChannelDelete.java | 2 +
.../usercommandhandlers/ChannelLeave.java | 2 +
.../ChannelListUpdate.java | 2 +
.../usercommandhandlers/ClanPenalty.java | 2 +
.../usercommandhandlers/ClanWarsList.java | 2 +
.../usercommandhandlers/DisMount.java | 2 +
.../handlers/usercommandhandlers/Escape.java | 3 +
.../usercommandhandlers/InstanceZone.java | 2 +
.../handlers/usercommandhandlers/Loc.java | 2 +
.../handlers/usercommandhandlers/Mount.java | 2 +
.../usercommandhandlers/OlympiadStat.java | 2 +
.../usercommandhandlers/PartyInfo.java | 2 +
.../handlers/usercommandhandlers/Time.java | 2 +
.../voicedcommandhandlers/Banking.java | 2 +
.../voicedcommandhandlers/ChangePassword.java | 2 +
.../voicedcommandhandlers/ChatAdmin.java | 2 +
.../handlers/voicedcommandhandlers/Debug.java | 2 +
.../handlers/voicedcommandhandlers/Lang.java | 9 +-
.../voicedcommandhandlers/TvTVoicedInfo.java | 2 +
.../voicedcommandhandlers/Wedding.java | 3 +
.../voicedcommandhandlers/castle.java | 2 +
.../handlers/voicedcommandhandlers/set.java | 2 +
.../hellbound/BaseTower/BaseTower.java | 5 +-
.../game/data/scripts/hellbound/Engine.java | 4 +-
.../data/scripts/hellbound/Quarry/Quarry.java | 16 +-
.../hellbound/TowerOfNaia/TowerOfNaia.java | 5 +-
.../TullyWorkshop/TullyWorkshop.java | 2 +-
.../CrystalCaverns/CrystalCaverns.java | 79 ++-
.../DarkCloudMansion/DarkCloudMansion.java | 116 ++--
.../DemonPrinceFloor/DemonPrinceFloor.java | 40 +-
.../FinalEmperialTomb/FinalEmperialTomb.java | 50 +-
.../HellboundTown/HellboundTown.java | 54 +-
.../scripts/instances/Kamaloka/Kamaloka.java | 81 ++-
.../NornilsGarden/NornilsGarden.java | 67 +--
.../Pailaka/PailakaDevilsLegacy.java | 48 +-
.../Pailaka/PailakaSongOfIceAndFire.java | 28 +-
.../instances/RankuFloor/RankuFloor.java | 49 +-
.../instances/SeedOfDestruction/Stage1.java | 47 +-
.../SeedOfInfinity/HallOfSuffering.java | 55 +-
.../mods/eventmodElpies/eventmodElpies.java | 1 +
.../mods/eventmodRabbits/eventmodRabbits.java | 1 +
.../mods/eventmodRace/eventmodRace.java | 13 +-
.../Q10288_SecretMission.java | 11 +-
.../Q20_BringUpWithLove.java | 11 +-
.../Q290_ThreatRemoval.java | 8 +-
.../Q309_ForAGoodCause.java | 11 +-
.../Q350_EnhanceYourWeapon.java | 7 +-
.../Q423_TakeYourBestShot.java | 3 +-
.../Q511_AwlUnderFoot/Q511_AwlUnderFoot.java | 68 ++-
.../Q636_TruthBeyond/Q636_TruthBeyond.java | 9 +-
.../Q637_ThroughOnceMore.java | 3 +-
.../quests/SagasScripts/SagaOfTheDuelist.java | 6 +-
.../quests/SagasScripts/SagasSuperClass.java | 27 +-
.../PriestOfBlessing/PriestOfBlessing.java | 10 +-
.../ElrokiTeleporters/ElrokiTeleporters.java | 5 +-
.../scripts/vehicles/AirShipController.java | 2 +
.../vehicles/EngineerLekon/EngineerLekon.java | 3 +-
.../game/data/stats/skills/22000-22099.xml | 2 +-
237 files changed, 1425 insertions(+), 1290 deletions(-)
diff --git a/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs b/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs
index 4cb90fe976..e5b7679ad0 100644
--- a/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Oct 15 19:54:03 UYST 2011
+#Sat Oct 15 19:54:02 UYST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -10,6 +10,7 @@ org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
@@ -30,11 +31,24 @@ org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=no_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
@@ -47,9 +61,9 @@ org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
@@ -62,13 +76,13 @@ org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
diff --git a/L2J_DataPack_BETA/.settings/org.eclipse.jdt.ui.prefs b/L2J_DataPack_BETA/.settings/org.eclipse.jdt.ui.prefs
index e410040d22..3621f22178 100644
--- a/L2J_DataPack_BETA/.settings/org.eclipse.jdt.ui.prefs
+++ b/L2J_DataPack_BETA/.settings/org.eclipse.jdt.ui.prefs
@@ -1,5 +1,4 @@
-#Sat Oct 01 02:05:53 UYT 2011
-"=id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+#Sat Oct 01 02:05:14 UYT 2011
cleanup.add_default_serial_version_id=true
cleanup.add_generated_serial_version_id=false
cleanup.add_missing_annotations=true
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
index f44438cd5c..acd5640c2f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
@@ -111,8 +111,7 @@ public class BeastFarm extends L2AttackableAIScript
else
return _skillSuccessNpcIdList.get(SKILL_CRYSTAL_SPICE);
}
- else
- return -1;
+ return -1;
}
else if (_growthLevel == 2 && Rnd.get(100) < TAME_CHANCE)
return _tameNpcId;
@@ -373,10 +372,8 @@ public class BeastFarm extends L2AttackableAIScript
{
return super.onSkillSee(npc, caster, skill, targets, isPet);
}
- else
- {
- _FeedInfo.put(objectId, caster.getObjectId());
- }
+
+ _FeedInfo.put(objectId, caster.getObjectId());
// display the social action of the beast eating the food.
npc.broadcastSocialAction(2);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
index 41ac662901..68bd0cb5d8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
@@ -507,10 +507,8 @@ public class FeedableBeasts extends L2AttackableAIScript
{
return super.onSkillSee(npc, caster, skill, targets, isPet);
}
- else
- {
- _FeedInfo.put(objectId, caster.getObjectId());
- }
+
+ _FeedInfo.put(objectId, caster.getObjectId());
int food = 0;
if (skillId == SKILL_GOLDEN_SPICE)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
index d81dab0d94..1d3c868b43 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Beleth.java
@@ -400,24 +400,29 @@ public class Beleth extends L2AttackableAIScript
}
@Override
- public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
+ public String onKill(L2Npc npc, L2PcInstance killer, boolean isPet)
{
- if ((npc.getNpcId() == 29118) && (player != null))
+ if (npc == null)
{
- if (player.getParty() != null)
+ return super.onKill(npc, killer, isPet);
+ }
+
+ if ((npc.getNpcId() == 29118) && (killer != null))
+ {
+ if (killer.getParty() != null)
{
- if (player.getParty().getCommandChannel() != null)
+ if (killer.getParty().getCommandChannel() != null)
{
- belethKiller = player.getParty().getCommandChannel().getChannelLeader();
+ belethKiller = killer.getParty().getCommandChannel().getChannelLeader();
}
else
{
- belethKiller = player.getParty().getLeader();
+ belethKiller = killer.getParty().getLeader();
}
}
else
{
- belethKiller = player;
+ belethKiller = killer;
}
GrandBossManager.getInstance().setBossStatus(29118, 3);
long respawnTime = (long) Config.INTERVAL_OF_BELETH_SPAWN + Rnd.get(Config.RANDOM_OF_BELETH_SPAWN);
@@ -426,10 +431,7 @@ public class Beleth extends L2AttackableAIScript
GrandBossManager.getInstance().setStatsSet(29118, info);
ThreadPoolManager.getInstance().scheduleGeneral(new unlock(), respawnTime);
deleteAll();
- if (npc != null)
- {
- npc.deleteMe();
- }
+ npc.deleteMe();
movie = true;
beleth = spawn(29118, new Location(16323, 213170, -9357, 49152));
beleth.setIsInvul(true);
@@ -483,8 +485,13 @@ public class Beleth extends L2AttackableAIScript
}
@Override
- public String onAttack(L2Npc npc, L2PcInstance player, int damage, boolean isPet)
+ public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isPet)
{
+ if (npc == null)
+ {
+ return super.onAttack(npc, attacker, damage, isPet);
+ }
+
if ((npc.getNpcId() == 29118) || (npc.getNpcId() == 29119))
{
if ((npc.getObjectId() == allowObjectId) && !attacked)
@@ -501,24 +508,24 @@ public class Beleth extends L2AttackableAIScript
{
return null;
}
- final double distance = Math.sqrt(npc.getPlanDistanceSq(player.getX(), player.getY()));
+ final double distance = Math.sqrt(npc.getPlanDistanceSq(attacker.getX(), attacker.getY()));
if ((distance > 500) || (Rnd.get(100) < 80))
{
for (L2Npc beleth : minions)
{
- if ((beleth != null) && !beleth.isDead() && Util.checkIfInRange(900, beleth, player, false) && !beleth.isCastingNow())
+ if ((beleth != null) && !beleth.isDead() && Util.checkIfInRange(900, beleth, attacker, false) && !beleth.isCastingNow())
{
- beleth.setTarget(player);
+ beleth.setTarget(attacker);
beleth.doCast(Fireball);
}
}
- if ((beleth != null) && !beleth.isDead() && Util.checkIfInRange(900, beleth, player, false) && !beleth.isCastingNow())
+ if ((beleth != null) && !beleth.isDead() && Util.checkIfInRange(900, beleth, attacker, false) && !beleth.isCastingNow())
{
- beleth.setTarget(player);
+ beleth.setTarget(attacker);
beleth.doCast(Fireball);
}
}
- else if ((npc != null) && !npc.isDead() && !npc.isCastingNow())
+ else if (!npc.isDead() && !npc.isCastingNow())
{
if (!npc.getKnownList().getKnownPlayersInRadius(200).isEmpty())
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java
index c55c5975c8..3b2b4a440f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/IceFairySirra.java
@@ -327,33 +327,33 @@ public class IceFairySirra extends L2AttackableAIScript
if (event.equalsIgnoreCase("check_condition"))
{
if (npc.isBusy())//should never happen
+ {
return super.onAdvEvent(event, npc, player);
- else
+ }
+
+ String filename = "";
+ if (player.isInParty() && player.getParty().getPartyLeaderOID() == player.getObjectId())
{
- String filename = "";
- if (player.isInParty() && player.getParty().getPartyLeaderOID() == player.getObjectId())
+ if (checkItems(player))
{
- if (checkItems(player) == true)
- {
- startQuestTimer("start",100000,null,player);
- _player = player;
- destroyItems(player);
- player.getInventory().addItem("Scroll",8379,3,player,null);
- npc.setBusy(true);
- screenMessage(player,NpcStringId.STEWARD_PLEASE_WAIT_A_MOMENT,100000);
- filename = getHtmlPath(3);
- }
- else
- {
- filename = getHtmlPath(2);
- }
+ startQuestTimer("start",100000,null,player);
+ _player = player;
+ destroyItems(player);
+ player.getInventory().addItem("Scroll",8379,3,player,null);
+ npc.setBusy(true);
+ screenMessage(player,NpcStringId.STEWARD_PLEASE_WAIT_A_MOMENT,100000);
+ filename = getHtmlPath(3);
}
else
{
- filename = getHtmlPath(1);
+ filename = getHtmlPath(2);
}
- sendHtml(npc, player, filename);
}
+ else
+ {
+ filename = getHtmlPath(1);
+ }
+ sendHtml(npc, player, filename);
}
else if (event.equalsIgnoreCase("start"))
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
index 5c74021ade..cbd4031f06 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
@@ -53,6 +53,7 @@ public final class FortressOfResistance extends ClanHallSiegeEngine
* @param questId
* @param name
* @param descr
+ * @param hallId
*/
public FortressOfResistance(int questId, String name, String descr, final int hallId)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java
index d996609dc2..e47dc57699 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java
@@ -43,6 +43,7 @@ public final class FortressOfTheDead extends ClanHallSiegeEngine
* @param questId
* @param name
* @param descr
+ * @param hallId
*/
public FortressOfTheDead(int questId, String name, String descr, final int hallId)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/MissQueen.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/MissQueen.java
index df10d7525c..ed55c9fa0c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/MissQueen.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/MissQueen.java
@@ -37,7 +37,7 @@ public class MissQueen extends Quest
};
// enable/disable coupon give
- private static final boolean QUEEN_ENABLED = false;
+ private static boolean QUEEN_ENABLED = false;
// Newbie/one time rewards section
// Any quest should rely on a unique bit, but
// it could be shared among quest that were mutually
@@ -65,52 +65,52 @@ public class MissQueen extends Quest
String htmltext = event;
if (!QUEEN_ENABLED)
+ {
return htmltext;
- else
+ }
+
+ QuestState st = player.getQuestState(qn);
+ int newbie = player.getNewbie();
+ int level = player.getLevel();
+ int occupation_level = player.getClassId().level();
+ int pkkills = player.getPkKills();
+ if (event.equals("newbie_give_coupon"))
{
- QuestState st = player.getQuestState(qn);
- int newbie = player.getNewbie();
- int level = player.getLevel();
- int occupation_level = player.getClassId().level();
- int pkkills = player.getPkKills();
- if (event.equals("newbie_give_coupon"))
+ /*
+ * TODO: check if this is the very first character for this account would need a bit of SQL, or a core method to determine it. This condition should be stored by the core in the account_data table upon character creation.
+ */
+ if (level >= 6 && level <= 25 && pkkills == 0 && occupation_level == 0)
{
- /*
- * TODO: check if this is the very first charactr for this account would need a bit of SQL, or a core method to determine it. This condition should be stored by the core in the account_data table upon character creation.
- */
- if (level >= 6 && level <= 25 && pkkills == 0 && occupation_level == 0)
+ if ((newbie | NEWBIE_REWARD) != newbie)
{
- if ((newbie | NEWBIE_REWARD) != newbie)
- {
- player.setNewbie(newbie | NEWBIE_REWARD);
- st.giveItems(COUPNE_ONE, 1);
- htmltext = "31760-2.htm"; // here's the coupon you requested
- }
- else
- htmltext = "31760-1.htm"; // you got a coupon already!
+ player.setNewbie(newbie | NEWBIE_REWARD);
+ st.giveItems(COUPNE_ONE, 1);
+ htmltext = "31760-2.htm"; // here's the coupon you requested
}
else
- htmltext = "31760-3.htm"; // you're not eligible to get a coupon (level caps, pkkills or already changed class)
+ htmltext = "31760-1.htm"; // you got a coupon already!
}
- else if (event.equals("traveller_give_coupon"))
- {
- if (level >= 6 && level <= 25 && pkkills == 0 && occupation_level == 1)
- { // check the player state against this quest newbie rewarding mark.
- if ((newbie | TRAVELER_REWARD) != newbie)
- {
- player.setNewbie(newbie | TRAVELER_REWARD);
- st.giveItems(COUPNE_TWO, 1);
- htmltext = "31760-5.htm"; // here's the coupon you requested
- }
- else
- htmltext = "31760-4.htm"; // you got a coupon already!
+ else
+ htmltext = "31760-3.htm"; // you're not eligible to get a coupon (level caps, pkkills or already changed class)
+ }
+ else if (event.equals("traveller_give_coupon"))
+ {
+ if (level >= 6 && level <= 25 && pkkills == 0 && occupation_level == 1)
+ { // check the player state against this quest newbie rewarding mark.
+ if ((newbie | TRAVELER_REWARD) != newbie)
+ {
+ player.setNewbie(newbie | TRAVELER_REWARD);
+ st.giveItems(COUPNE_TWO, 1);
+ htmltext = "31760-5.htm"; // here's the coupon you requested
}
else
- htmltext = "31760-6.htm"; // you're not eligible to get a coupon (level caps, pkkills or already changed class)
+ htmltext = "31760-4.htm"; // you got a coupon already!
}
-
- return htmltext;
+ else
+ htmltext = "31760-6.htm"; // you're not eligible to get a coupon (level caps, pkkills or already changed class)
}
+
+ return htmltext;
}
@Override
@@ -118,7 +118,7 @@ public class MissQueen extends Quest
{
QuestState st = player.getQuestState(qn);
if (st == null)
- st = this.newQuestState(player);
+ st = newQuestState(player);
return "31760.htm";
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
index fbff2d7d15..9b7d8f8476 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
@@ -116,8 +116,7 @@ public class NewbieCoupons extends Quest
MultiSell.getInstance().separateAndSend(WEAPON_MULTISELL, player, npc, false);
return null;
}
- else
- htmltext = "30598-7.htm"; // you're not eligible to use warehouse
+ htmltext = "30598-7.htm"; // you're not eligible to use warehouse
}
else if (event.equals("newbie_show_armor"))
{
@@ -126,8 +125,7 @@ public class NewbieCoupons extends Quest
MultiSell.getInstance().separateAndSend(ACCESORIES_MULTISELL, player, npc, false);
return null;
}
- else
- htmltext = "30598-8.htm"; // you're not eligible to use warehouse
+ htmltext = "30598-8.htm"; // you're not eligible to use warehouse
}
return htmltext;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index a6f39edde6..9e51fe6795 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -156,8 +156,7 @@ public class HeavyMedal extends Quest
{
if (st.getQuestItemsCount(GLITTERING_MEDAL) < MEDALS[level])
return "31229-no.htm";
- else
- return "31229-game.htm";
+ return "31229-game.htm";
}
else if (event.equalsIgnoreCase("heads") || event.equalsIgnoreCase("tails"))
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ArtefactInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ArtefactInstanceAction.java
index 2ab41be94a..dc18c547bc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ArtefactInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ArtefactInstanceAction.java
@@ -44,6 +44,7 @@ public class L2ArtefactInstanceAction implements IActionHandler
* <li>Client packet : Action, AttackRequest</li><BR>
* <BR>
*/
+ @Override
public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
{
if (!((L2Npc)target).canTarget(activeChar))
@@ -73,6 +74,7 @@ public class L2ArtefactInstanceAction implements IActionHandler
return true;
}
+ @Override
public InstanceType getInstanceType()
{
return InstanceType.L2ArtefactInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DecoyAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DecoyAction.java
index 63bc101a8d..5e19e9a6cf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DecoyAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DecoyAction.java
@@ -24,6 +24,7 @@ import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
public class L2DecoyAction implements IActionHandler
{
+ @Override
public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
{
// Aggression target lock effect
@@ -38,6 +39,7 @@ public class L2DecoyAction implements IActionHandler
return true;
}
+ @Override
public InstanceType getInstanceType()
{
return InstanceType.L2Decoy;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java
index c759d76974..ed1b6d36eb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java
@@ -30,6 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
public class L2DoorInstanceAction implements IActionHandler
{
+ @Override
public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
{
// Check if the L2PcInstance already target the L2NpcInstance
@@ -109,6 +110,7 @@ public class L2DoorInstanceAction implements IActionHandler
return true;
}
+ @Override
public InstanceType getInstanceType()
{
return InstanceType.L2DoorInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java
index ceb72bd562..61038e59df 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java
@@ -25,6 +25,7 @@ import com.l2jserver.gameserver.network.serverpackets.StaticObject;
public class L2DoorInstanceActionShift implements IActionHandler
{
+ @Override
public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
{
if (activeChar.getAccessLevel().isGm())
@@ -72,6 +73,7 @@ public class L2DoorInstanceActionShift implements IActionHandler
return true;
}
+ @Override
public InstanceType getInstanceType()
{
return InstanceType.L2DoorInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceAction.java
index a9143cc370..f914b7c7fe 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceAction.java
@@ -24,6 +24,7 @@ import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
public class L2ItemInstanceAction implements IActionHandler
{
+ @Override
public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
{
// this causes the validate position handler to do the pickup if the location is reached.
@@ -46,6 +47,7 @@ public class L2ItemInstanceAction implements IActionHandler
return true;
}
+ @Override
public InstanceType getInstanceType()
{
return InstanceType.L2ItemInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java
index 23a76d74a1..8c3562146e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java
@@ -24,6 +24,7 @@ import com.l2jserver.util.StringUtil;
public class L2ItemInstanceActionShift implements IActionHandler
{
+ @Override
public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
{
if (activeChar.getAccessLevel().isGm())
@@ -49,6 +50,7 @@ public class L2ItemInstanceActionShift implements IActionHandler
return true;
}
+ @Override
public InstanceType getInstanceType()
{
return InstanceType.L2ItemInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java
index 349dfade99..c05711004d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java
@@ -55,6 +55,7 @@ public class L2NpcAction implements IActionHandler
* @param activeChar The L2PcInstance that start an action on the L2Npc
*
*/
+ @Override
public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
{
if (!((L2Npc)target).canTarget(activeChar))
@@ -151,6 +152,7 @@ public class L2NpcAction implements IActionHandler
return true;
}
+ @Override
public InstanceType getInstanceType()
{
return InstanceType.L2Npc;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java
index b2636959da..deed6ac0f8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java
@@ -49,6 +49,7 @@ public class L2PcInstanceAction implements IActionHandler
* @param activeChar The player that start an action on target L2PcInstance
*
*/
+ @Override
public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
{
// See description in TvTEvent.java
@@ -130,6 +131,7 @@ public class L2PcInstanceAction implements IActionHandler
return true;
}
+ @Override
public InstanceType getInstanceType()
{
return InstanceType.L2PcInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java
index 3b5512895e..86e13f8745 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java
@@ -31,6 +31,7 @@ import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
public class L2PetInstanceAction implements IActionHandler
{
+ @Override
public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
{
// Aggression target lock effect
@@ -106,6 +107,7 @@ public class L2PetInstanceAction implements IActionHandler
return true;
}
+ @Override
public InstanceType getInstanceType()
{
return InstanceType.L2PetInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java
index cdb415fd87..81556c6b18 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java
@@ -27,6 +27,7 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
public class L2StaticObjectInstanceAction implements IActionHandler
{
+ @Override
public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
{
if(((L2StaticObjectInstance)target).getType() < 0)
@@ -71,6 +72,7 @@ public class L2StaticObjectInstanceAction implements IActionHandler
return true;
}
+ @Override
public InstanceType getInstanceType()
{
return InstanceType.L2StaticObjectInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java
index 5a13c7dca2..17504c49e4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java
@@ -26,6 +26,7 @@ import com.l2jserver.util.StringUtil;
public class L2StaticObjectInstanceActionShift implements IActionHandler
{
+ @Override
public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
{
if (activeChar.getAccessLevel().isGm())
@@ -60,6 +61,7 @@ public class L2StaticObjectInstanceActionShift implements IActionHandler
return true;
}
+ @Override
public InstanceType getInstanceType()
{
return InstanceType.L2StaticObjectInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java
index fdafe79570..13d9474ad8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java
@@ -32,6 +32,7 @@ import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
public class L2SummonAction implements IActionHandler
{
+ @Override
public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
{
// Aggression target lock effect
@@ -100,6 +101,7 @@ public class L2SummonAction implements IActionHandler
return true;
}
+ @Override
public InstanceType getInstanceType()
{
return InstanceType.L2Summon;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2TrapAction.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2TrapAction.java
index b680139f73..226ea8bddc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2TrapAction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2TrapAction.java
@@ -24,6 +24,7 @@ import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
public class L2TrapAction implements IActionHandler
{
+ @Override
public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
{
// Aggression target lock effect
@@ -39,6 +40,7 @@ public class L2TrapAction implements IActionHandler
return true;
}
+ @Override
public InstanceType getInstanceType()
{
return InstanceType.L2Trap;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBBS.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBBS.java
index 3d1ebb459f..62cf99c706 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBBS.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBBS.java
@@ -31,6 +31,7 @@ public class AdminBBS implements IAdminCommandHandler
*
* @see com.l2jserver.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
AdminBBSManager.getInstance().parsecmd(command, activeChar);
@@ -41,6 +42,7 @@ public class AdminBBS implements IAdminCommandHandler
*
* @see com.l2jserver.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
*/
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBan.java
index 4974206ade..0ca28f8ffc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBan.java
@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.util.GMAudit;
-
/**
* This class handles following admin commands:
* - ban_acc <account_name> = changes account access level to -100 and logs him off. If no account is specified target's account is used.
@@ -44,7 +43,8 @@ import com.l2jserver.gameserver.util.GMAudit;
* @version $Revision: 1.1.6.3 $ $Date: 2005/04/11 10:06:06 $
* con.close() change by Zoey76 24/02/2011
*/
-public class AdminBan implements IAdminCommandHandler {
+public class AdminBan implements IAdminCommandHandler
+{
private static final String[] ADMIN_COMMANDS =
{
"admin_ban", // returns ban commands
@@ -59,6 +59,7 @@ public class AdminBan implements IAdminCommandHandler {
"admin_unjail"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
StringTokenizer st = new StringTokenizer(command);
@@ -133,11 +134,8 @@ public class AdminBan implements IAdminCommandHandler {
activeChar.sendMessage("Usage: //ban_char <char_name> (if none, target char is banned)");
return false;
}
- else
- {
- auditAction(command, activeChar, (targetPlayer == null ? player : targetPlayer.getName()));
- return changeCharAccessLevel(targetPlayer, player, activeChar, -100);
- }
+ auditAction(command, activeChar, (targetPlayer == null ? player : targetPlayer.getName()));
+ return changeCharAccessLevel(targetPlayer, player, activeChar, -100);
}
else if (command.startsWith("admin_ban_chat"))
{
@@ -435,8 +433,7 @@ public class AdminBan implements IAdminCommandHandler {
activeChar.sendMessage("Character not found or access level unaltered.");
return false;
}
- else
- activeChar.sendMessage(player + " now has an access level of " + lvl);
+ activeChar.sendMessage(player + " now has an access level of " + lvl);
}
catch (SQLException se)
{
@@ -453,6 +450,7 @@ public class AdminBan implements IAdminCommandHandler {
return true;
}
+ @Override
public String[] getAdminCommandList() {
return ADMIN_COMMANDS;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index 8bc14d3738..a2679bdf97 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -43,6 +43,7 @@ public class AdminBuffs implements IAdminCommandHandler
"admin_switch_gm_buffs"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
@@ -72,11 +73,8 @@ public class AdminBuffs implements IAdminCommandHandler
showBuffs(activeChar, player, page);
return true;
}
- else
- {
- activeChar.sendMessage("The player " + playername + " is not online");
- return false;
- }
+ activeChar.sendMessage("The player " + playername + " is not online");
+ return false;
}
else if ((activeChar.getTarget() != null) && (activeChar.getTarget() instanceof L2Character))
{
@@ -207,11 +205,8 @@ public class AdminBuffs implements IAdminCommandHandler
activeChar.sendMessage("You have succefully changed to target " + (toAuraSkills ? "aura" : "one") + " special skills.");
return true;
}
- else
- {
- activeChar.sendMessage("There is nothing to switch.");
- return false;
- }
+ activeChar.sendMessage("There is nothing to switch.");
+ return false;
}
else
{
@@ -219,6 +214,7 @@ public class AdminBuffs implements IAdminCommandHandler
}
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCache.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCache.java
index 7fda0941dc..96825ad598 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCache.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCache.java
@@ -40,11 +40,13 @@ public class AdminCache implements IAdminCommandHandler
"admin_cache_crest_fix"
};
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
}
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCamera.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCamera.java
index ce16a0f180..761a1c0be2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCamera.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCamera.java
@@ -26,6 +26,7 @@ public class AdminCamera implements IAdminCommandHandler
"admin_camera"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
try
@@ -46,6 +47,7 @@ public class AdminCamera implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java
index 14f92f5e9f..c00b159caf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java
@@ -41,12 +41,14 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler
"admin_changelvl"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
handleChangeLevel(command, activeChar);
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
index 80c9e6d82a..3a775bcbcd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
@@ -50,6 +50,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler
private int itemId;
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
@@ -232,6 +233,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java
index c7c2104a18..305bf875e2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java
@@ -27,6 +27,7 @@ public class AdminDebug implements IAdminCommandHandler
"admin_debug"
};
+ @Override
public final boolean useAdminCommand(String command, L2PcInstance activeChar)
{
String[] commandSplit = command.split(" ");
@@ -53,6 +54,7 @@ public class AdminDebug implements IAdminCommandHandler
return true;
}
+ @Override
public final String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java
index 689b5c0b86..bae57e2530 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java
@@ -34,6 +34,7 @@ public class AdminDelete implements IAdminCommandHandler
"admin_delete"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.equals("admin_delete"))
@@ -41,6 +42,7 @@ public class AdminDelete implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java
index a0761feac5..35889d0b9e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDisconnect.java
@@ -31,6 +31,7 @@ public class AdminDisconnect implements IAdminCommandHandler
"admin_character_disconnect"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.equals("admin_character_disconnect"))
@@ -40,6 +41,7 @@ public class AdminDisconnect implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java
index 69557f377e..b1deb62502 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java
@@ -50,6 +50,7 @@ public class AdminDoorControl implements IAdminCommandHandler
"admin_closeall"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
try
@@ -131,6 +132,7 @@ public class AdminDoorControl implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 277553ac31..344cc40804 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -1165,12 +1165,10 @@ public class AdminEditChar implements IAdminCommandHandler
{
continue;
}
- else
- {
- ip = client.getConnection().getInetAddress().getHostAddress();
- if (!ip.equals(IpAdress))
- continue;
- }
+
+ ip = client.getConnection().getInetAddress().getHostAddress();
+ if (!ip.equals(IpAdress))
+ continue;
}
name = player.getName();
@@ -1246,6 +1244,7 @@ public class AdminEditChar implements IAdminCommandHandler
/**
* @param activeChar
+ * @param multibox
*/
private void findDualbox(L2PcInstance activeChar, int multibox)
{
@@ -1262,22 +1261,22 @@ public class AdminEditChar implements IAdminCommandHandler
{
client = player.getClient();
if (client == null || client.isDetached())
+ {
continue;
- else
+ }
+
+ ip = client.getConnection().getInetAddress().getHostAddress();
+ if (ipMap.get(ip) == null)
+ ipMap.put(ip, new ArrayList<L2PcInstance>());
+ ipMap.get(ip).add(player);
+
+ if (ipMap.get(ip).size() >= multibox)
{
- ip = client.getConnection().getInetAddress().getHostAddress();
- if (ipMap.get(ip) == null)
- ipMap.put(ip, new ArrayList<L2PcInstance>());
- ipMap.get(ip).add(player);
-
- if (ipMap.get(ip).size() >= multibox)
- {
- Integer count = dualboxIPs.get(ip);
- if (count == null)
- dualboxIPs.put(ip, multibox);
- else
- dualboxIPs.put(ip, count + 1);
- }
+ Integer count = dualboxIPs.get(ip);
+ if (count == null)
+ dualboxIPs.put(ip, multibox);
+ else
+ dualboxIPs.put(ip, count + 1);
}
}
@@ -1319,22 +1318,22 @@ public class AdminEditChar implements IAdminCommandHandler
{
client = player.getClient();
if (client == null || client.isDetached())
+ {
continue;
- else
+ }
+
+ IpPack pack = new IpPack(client.getConnection().getInetAddress().getHostAddress(), client.getTrace());
+ if (ipMap.get(pack) == null)
+ ipMap.put(pack, new ArrayList<L2PcInstance>());
+ ipMap.get(pack).add(player);
+
+ if (ipMap.get(pack).size() >= multibox)
{
- IpPack pack = new IpPack(client.getConnection().getInetAddress().getHostAddress(), client.getTrace());
- if (ipMap.get(pack) == null)
- ipMap.put(pack, new ArrayList<L2PcInstance>());
- ipMap.get(pack).add(player);
-
- if (ipMap.get(pack).size() >= multibox)
- {
- Integer count = dualboxIPs.get(pack);
- if (count == null)
- dualboxIPs.put(pack, multibox);
- else
- dualboxIPs.put(pack, count + 1);
- }
+ Integer count = dualboxIPs.get(pack);
+ if (count == null)
+ dualboxIPs.put(pack, multibox);
+ else
+ dualboxIPs.put(pack, count + 1);
}
}
@@ -1482,6 +1481,7 @@ public class AdminEditChar implements IAdminCommandHandler
_player = player;
}
+ @Override
public void run()
{
_player.untransform();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index a8ad77bfb4..b78c73bb58 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -708,8 +708,7 @@ public class AdminEffects implements IAdminCommandHandler
character.startAbnormalEffect(action);
return true;
}
- else
- return false;
+ return false;
}
private boolean performSpecial(int action, L2Object target)
@@ -723,8 +722,7 @@ public class AdminEffects implements IAdminCommandHandler
character.startSpecialEffect(action);
return true;
}
- else
- return false;
+ return false;
}
private boolean performSocial(int action, L2Object target, L2PcInstance activeChar)
@@ -765,6 +763,7 @@ public class AdminEffects implements IAdminCommandHandler
* @param type - atmosphere type (signssky,sky)
* @param state - atmosphere state(night,day)
* @param duration
+ * @param activeChar
*/
private void adminAtmosphere(String type, String state, int duration, L2PcInstance activeChar)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java
index 566dd65b1e..b6f9033b0d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java
@@ -45,6 +45,7 @@ public class AdminElement implements IAdminCommandHandler
"admin_setls"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
int armorType = -1;
@@ -90,6 +91,7 @@ public class AdminElement implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java
index 1a8515ff07..b6ea7041bc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java
@@ -59,6 +59,7 @@ public class AdminEnchant implements IAdminCommandHandler
"admin_enchant"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.equals("admin_enchant"))
@@ -189,6 +190,7 @@ public class AdminEnchant implements IAdminCommandHandler
AdminHelpPage.showHelpPage(activeChar, "enchant.htm");
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
index 1d1c3e44d1..6f0289357e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
@@ -84,6 +84,7 @@ public class AdminEventEngine implements IAdminCommandHandler
private static String tempName = "";
private static boolean npcsDeleted = false;
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
StringTokenizer st = new StringTokenizer(command);
@@ -422,6 +423,7 @@ public class AdminEventEngine implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java
index 38e77b4105..a85051b333 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java
@@ -36,11 +36,13 @@ public class AdminEvents implements IAdminCommandHandler
"admin_event_bypass"
};
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
}
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (activeChar == null)
@@ -72,11 +74,9 @@ public class AdminEvents implements IAdminCommandHandler
activeChar.sendMessage("Event '"+_event_name+"' started.");
return true;
}
- else
- {
- activeChar.sendMessage("There is problem with starting '"+_event_name+"' event.");
- return true;
- }
+
+ activeChar.sendMessage("There is problem with starting '"+_event_name+"' event.");
+ return true;
}
}
}
@@ -101,11 +101,9 @@ public class AdminEvents implements IAdminCommandHandler
activeChar.sendMessage("Event '"+_event_name+"' stopped.");
return true;
}
- else
- {
- activeChar.sendMessage("There is problem with stoping '"+_event_name+"' event.");
- return true;
- }
+
+ activeChar.sendMessage("There is problem with stoping '"+_event_name+"' event.");
+ return true;
}
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
index cfc304025f..ec87f2b208 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
@@ -42,6 +42,7 @@ public class AdminExpSp implements IAdminCommandHandler
"admin_remove_exp_sp"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.startsWith("admin_add_exp_sp"))
@@ -74,6 +75,7 @@ public class AdminExpSp implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
@@ -118,31 +120,29 @@ public class AdminExpSp implements IAdminCommandHandler
{
return false;
}
- else
+
+ String exp = st.nextToken();
+ String sp = st.nextToken();
+ long expval = 0;
+ int spval = 0;
+ try
{
- String exp = st.nextToken();
- String sp = st.nextToken();
- long expval = 0;
- int spval = 0;
- try
- {
- expval = Long.parseLong(exp);
- spval = Integer.parseInt(sp);
- }
- catch (Exception e)
- {
- return false;
- }
- if (expval != 0 || spval != 0)
- {
- //Common character information
- player.sendMessage("Admin is adding you " + expval + " xp and " + spval + " sp.");
- player.addExpAndSp(expval, spval);
- //Admin information
- activeChar.sendMessage("Added " + expval + " xp and " + spval + " sp to " + player.getName() + ".");
- if (Config.DEBUG)
- _log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") added " + expval + " xp and " + spval + " sp to " + player.getObjectId() + ".");
- }
+ expval = Long.parseLong(exp);
+ spval = Integer.parseInt(sp);
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+ if (expval != 0 || spval != 0)
+ {
+ //Common character information
+ player.sendMessage("Admin is adding you " + expval + " xp and " + spval + " sp.");
+ player.addExpAndSp(expval, spval);
+ //Admin information
+ activeChar.sendMessage("Added " + expval + " xp and " + spval + " sp to " + player.getName() + ".");
+ if (Config.DEBUG)
+ _log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") added " + expval + " xp and " + spval + " sp to " + player.getObjectId() + ".");
}
return true;
}
@@ -162,32 +162,32 @@ public class AdminExpSp implements IAdminCommandHandler
}
StringTokenizer st = new StringTokenizer(ExpSp);
if (st.countTokens() != 2)
+ {
return false;
- else
+ }
+
+ String exp = st.nextToken();
+ String sp = st.nextToken();
+ long expval = 0;
+ int spval = 0;
+ try
{
- String exp = st.nextToken();
- String sp = st.nextToken();
- long expval = 0;
- int spval = 0;
- try
- {
- expval = Long.parseLong(exp);
- spval = Integer.parseInt(sp);
- }
- catch (Exception e)
- {
- return false;
- }
- if (expval != 0 || spval != 0)
- {
- //Common character information
- player.sendMessage("Admin is removing you " + expval + " xp and " + spval + " sp.");
- player.removeExpAndSp(expval, spval);
- //Admin information
- activeChar.sendMessage("Removed " + expval + " xp and " + spval + " sp from " + player.getName() + ".");
- if (Config.DEBUG)
- _log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") removed " + expval + " xp and " + spval + " sp from " + player.getObjectId() + ".");
- }
+ expval = Long.parseLong(exp);
+ spval = Integer.parseInt(sp);
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+ if (expval != 0 || spval != 0)
+ {
+ //Common character information
+ player.sendMessage("Admin is removing you " + expval + " xp and " + spval + " sp.");
+ player.removeExpAndSp(expval, spval);
+ //Admin information
+ activeChar.sendMessage("Removed " + expval + " xp and " + spval + " sp from " + player.getName() + ".");
+ if (Config.DEBUG)
+ _log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") removed " + expval + " xp and " + spval + " sp from " + player.getObjectId() + ".");
}
return true;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 23d08754da..0649605138 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -46,6 +46,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
};
//TODO: remove from gm list etc etc
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
try
@@ -63,6 +64,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index 0accc3bdbc..e6b26dc2c3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -51,6 +51,7 @@ public class AdminFortSiege implements IAdminCommandHandler
"admin_removefort"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
StringTokenizer st = new StringTokenizer(command, " ");
@@ -167,6 +168,7 @@ public class AdminFortSiege implements IAdminCommandHandler
activeChar.sendPacket(adminReply);
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeoEditor.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeoEditor.java
index 718b01d570..4583587dca 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeoEditor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeoEditor.java
@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.geoeditorcon.GeoEditorListener;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-
/**
* @author Luno, Dezmond
*/
@@ -35,6 +34,7 @@ public class AdminGeoEditor implements IAdminCommandHandler
"admin_ge_leave"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (!Config.ACCEPT_GEOEDITOR_CONN)
@@ -104,6 +104,7 @@ public class AdminGeoEditor implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
index aca05831ae..dc9e464d66 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
- *
* @author -Nemesiss-
*/
public class AdminGeodata implements IAdminCommandHandler
@@ -37,6 +36,7 @@ public class AdminGeodata implements IAdminCommandHandler
"admin_geo_unload"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (Config.GEODATA < 1)
@@ -148,6 +148,7 @@ public class AdminGeodata implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java
index 20e74b7d82..730a15da14 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java
@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.datatables.AccessLevels;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-
/**
* This class handles following admin commands:
* - gm = turns gm mode off
@@ -37,6 +36,7 @@ public class AdminGm implements IAdminCommandHandler
"admin_gm"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
@@ -46,6 +46,7 @@ public class AdminGm implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java
index 5255e8b353..c703195270 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java
@@ -40,6 +40,7 @@ public class AdminGmChat implements IAdminCommandHandler
"admin_gmchat_menu"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.startsWith("admin_gmchat"))
@@ -80,6 +81,7 @@ public class AdminGmChat implements IAdminCommandHandler
activeChar.addSnooped(player);
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java
index 9a6e5404ed..5c4b72a5c9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java
@@ -32,9 +32,9 @@ public class AdminGraciaSeeds implements IAdminCommandHandler
};
/**
- *
* @see com.l2jserver.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
StringTokenizer st = new StringTokenizer(command, " ");
@@ -76,6 +76,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler
*
* @see com.l2jserver.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
*/
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHelpPage.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHelpPage.java
index bb4f945264..c657599ad8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHelpPage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHelpPage.java
@@ -33,6 +33,7 @@ public class AdminHelpPage implements IAdminCommandHandler
"admin_help"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
@@ -52,6 +53,7 @@ public class AdminHelpPage implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java
index c301e6fc1e..2c3c7f163d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.model.entity.Instance;
/**
* @author evill33t, GodKratos
- *
*/
public class AdminInstance implements IAdminCommandHandler
{
@@ -40,6 +39,7 @@ public class AdminInstance implements IAdminCommandHandler
"admin_listinstances"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
StringTokenizer st = new StringTokenizer(command);
@@ -92,31 +92,29 @@ public class AdminInstance implements IAdminCommandHandler
activeChar.sendMessage("Instance " + val + " doesnt exist.");
return false;
}
- else
+
+ L2Object target = activeChar.getTarget();
+ if (target == null || target instanceof L2Summon) // Don't separate summons from masters
{
- L2Object target = activeChar.getTarget();
- if (target == null || target instanceof L2Summon) // Don't separate summons from masters
- {
- activeChar.sendMessage("Incorrect target.");
- return false;
- }
- target.setInstanceId(val);
- if (target instanceof L2PcInstance)
+ activeChar.sendMessage("Incorrect target.");
+ return false;
+ }
+ target.setInstanceId(val);
+ if (target instanceof L2PcInstance)
+ {
+ L2PcInstance player = (L2PcInstance) target;
+ player.sendMessage("Admin set your instance to:" + val);
+ player.teleToLocation(player.getX(), player.getY(), player.getZ());
+ L2Summon pet = player.getPet();
+ if (pet != null)
{
- L2PcInstance player = (L2PcInstance) target;
- player.sendMessage("Admin set your instance to:" + val);
- player.teleToLocation(player.getX(), player.getY(), player.getZ());
- L2Summon pet = player.getPet();
- if (pet != null)
- {
- pet.setInstanceId(val);
- pet.teleToLocation(pet.getX(), pet.getY(), pet.getZ());
- player.sendMessage("Admin set " + pet.getName() + "'s instance to:" + val);
- }
+ pet.setInstanceId(val);
+ pet.teleToLocation(pet.getX(), pet.getY(), pet.getZ());
+ player.sendMessage("Admin set " + pet.getName() + "'s instance to:" + val);
}
- activeChar.sendMessage("Moved " + target.getName() + " to instance " + target.getInstanceId() + ".");
- return true;
}
+ activeChar.sendMessage("Moved " + target.getName() + " to instance " + target.getInstanceId() + ".");
+ return true;
}
catch (Exception e)
{
@@ -162,6 +160,7 @@ public class AdminInstance implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
index fa163dbf82..3887242038 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
@@ -20,6 +20,7 @@ public class AdminInstanceZone implements IAdminCommandHandler
"admin_instancezone_clear"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target";
@@ -86,6 +87,7 @@ public class AdminInstanceZone implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java
index 3560305e0c..f3c53321a6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java
@@ -37,6 +37,7 @@ public class AdminInvul implements IAdminCommandHandler
"admin_setinvul"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
@@ -56,6 +57,7 @@ public class AdminInvul implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java
index 1d7074c52f..31b876b183 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java
@@ -45,6 +45,7 @@ public class AdminKill implements IAdminCommandHandler
"admin_kill_monster"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.startsWith("admin_kill"))
@@ -80,10 +81,7 @@ public class AdminKill implements IAdminCommandHandler
return false;
}
}
- else
- {
- kill(activeChar, plyr);
- }
+ kill(activeChar, plyr);
}
else
{
@@ -150,6 +148,7 @@ public class AdminKill implements IAdminCommandHandler
_log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ")" + " killed character " + target.getObjectId());
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java
index 19b96c6c71..4cae3e02de 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java
@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-
public class AdminLevel implements IAdminCommandHandler
{
private static final String[] ADMIN_COMMANDS =
@@ -33,9 +32,9 @@ public class AdminLevel implements IAdminCommandHandler
};
/**
- *
* @see com.l2jserver.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
L2Object targetChar = activeChar.getTarget();
@@ -105,6 +104,7 @@ public class AdminLevel implements IAdminCommandHandler
*
* @see com.l2jserver.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
*/
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java
index a40964367f..bfd4703b28 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java
@@ -45,6 +45,7 @@ public class AdminLogin implements IAdminCommandHandler
*
* @see com.l2jserver.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.equals("admin_server_gm_only"))
@@ -164,7 +165,7 @@ public class AdminLogin implements IAdminCommandHandler
}
/**
- *
+ * @param activeChar
*/
private void showMainPage(L2PcInstance activeChar)
{
@@ -241,6 +242,7 @@ public class AdminLogin implements IAdminCommandHandler
*
* @see com.l2jserver.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
*/
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMammon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMammon.java
index 0cab3d493d..2c20d5926a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMammon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMammon.java
@@ -32,6 +32,7 @@ public class AdminMammon implements IAdminCommandHandler
private boolean _isSealValidation = SevenSigns.getInstance().isSealValidationPeriod();
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
int teleportIndex = -1;
@@ -126,6 +127,7 @@ public class AdminMammon implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java
index eb55a26b31..7e9589359f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java
@@ -51,6 +51,7 @@ public class AdminManor implements IAdminCommandHandler
"admin_manor_disable"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
StringTokenizer st = new StringTokenizer(command);
@@ -133,6 +134,7 @@ public class AdminManor implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return _adminCommands;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java
index faa076f1d9..a0823ba857 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java
@@ -54,6 +54,7 @@ public class AdminMobGroup implements IAdminCommandHandler
"admin_mobgroup_invul"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.equals("admin_mobmenu"))
@@ -105,6 +106,7 @@ public class AdminMobGroup implements IAdminCommandHandler
/**
* @param activeChar
+ * @param command
*/
private void showMainPage(L2PcInstance activeChar, String command)
{
@@ -566,6 +568,7 @@ public class AdminMobGroup implements IAdminCommandHandler
activeChar.sendPacket(SystemMessageId.FRIEND_LIST_FOOTER);
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java
index 05a24f2190..c4705ff95c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java
@@ -41,6 +41,7 @@ public class AdminMonsterRace implements IAdminCommandHandler
protected static int state = -1;
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.equalsIgnoreCase("admin_mons"))
@@ -50,6 +51,7 @@ public class AdminMonsterRace implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
@@ -125,6 +127,7 @@ public class AdminMonsterRace implements IAdminCommandHandler
activeChar = pActiveChar;
}
+ @Override
public void run()
{
//int[][] speeds1 = MonsterRace.getInstance().getSpeeds();
@@ -158,6 +161,7 @@ public class AdminMonsterRace implements IAdminCommandHandler
activeChar = pActiveChar;
}
+ @Override
public void run()
{
DeleteObject obj = null;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java
index a56dfd21eb..fa25b59dc5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java
@@ -45,6 +45,7 @@ public class AdminPForge implements IAdminCommandHandler
"admin_forge3"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.equals("admin_forge"))
@@ -273,6 +274,7 @@ public class AdminPForge implements IAdminCommandHandler
return false;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
index 81327d574f..0d688eeb07 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
@@ -34,6 +34,7 @@ public class AdminPathNode implements IAdminCommandHandler
"admin_find_path",
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.equals("admin_pn_info"))
@@ -83,6 +84,7 @@ public class AdminPathNode implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java
index 9520fa7e5e..36ae19eb76 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
* This class handles commands for GMs to respond to petitions.
*
* @author Tempy
- *
*/
public class AdminPetition implements IAdminCommandHandler
{
@@ -38,6 +37,7 @@ public class AdminPetition implements IAdminCommandHandler
"admin_force_peti"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
int petitionId = -1;
@@ -113,6 +113,7 @@ public class AdminPetition implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index f88947d32b..9a6958a318 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
@@ -44,6 +44,7 @@ public class AdminPledge implements IAdminCommandHandler
"admin_pledge"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
L2Object target = activeChar.getTarget();
@@ -143,6 +144,7 @@ public class AdminPledge implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
index c2a85d43fb..60798f1698 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java
@@ -45,6 +45,7 @@ public class AdminPolymorph implements IAdminCommandHandler
"admin_untransform_menu",
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (activeChar.isMounted())
@@ -133,6 +134,7 @@ public class AdminPolymorph implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
@@ -140,7 +142,7 @@ public class AdminPolymorph implements IAdminCommandHandler
/**
* @param activeChar
- * @param target
+ * @param obj
* @param id
* @param type
*/
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 1f8b97ebc4..b7d6bacbff 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -36,6 +36,7 @@ public class AdminQuest implements IAdminCommandHandler
*
* @see com.l2jserver.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (activeChar == null)
@@ -132,6 +133,7 @@ public class AdminQuest implements IAdminCommandHandler
*
* @see com.l2jserver.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
*/
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java
index 40e5e1dda8..20a1a9734c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java
@@ -39,12 +39,14 @@ public class AdminRepairChar implements IAdminCommandHandler
"admin_repair"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
handleRepair(command);
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java
index 34b8166cdf..71ab5f9f8e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java
@@ -42,6 +42,7 @@ public class AdminRes implements IAdminCommandHandler
"admin_res_monster"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.startsWith("admin_res "))
@@ -56,6 +57,7 @@ public class AdminRes implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
index 2dbd1a292c..48ffc4619e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
@@ -41,6 +41,7 @@ public class AdminRide implements IAdminCommandHandler
private static final int JET_BIKE_TRANSFORMATION_ID = 20001;
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
L2PcInstance player = getRideTarget(activeChar);
@@ -123,6 +124,7 @@ public class AdminRide implements IAdminCommandHandler
return player;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java
index 29d366646f..2952da619f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java
@@ -42,6 +42,7 @@ public class AdminShop implements IAdminCommandHandler
"admin_gmshop"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.startsWith("admin_buy"))
@@ -62,6 +63,7 @@ public class AdminShop implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java
index 992631573f..f84e0edeef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java
@@ -17,7 +17,6 @@ package handlers.admincommandhandlers;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.SQLException;
import javolution.text.TextBuilder;
@@ -47,6 +46,7 @@ public class AdminShowQuests implements IAdminCommandHandler
"admin_setcharquest"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
String[] cmdParams = command.split(" ");
@@ -144,7 +144,7 @@ public class AdminShowQuests implements IAdminCommandHandler
actor.sendPacket(adminReply);
}
- private void showquestmenu(L2PcInstance target, L2PcInstance actor, String[] val) throws SQLException
+ private void showquestmenu(L2PcInstance target, L2PcInstance actor, String[] val)
{
Connection con = null;
try
@@ -179,9 +179,10 @@ public class AdminShowQuests implements IAdminCommandHandler
while(rs.next()){
String var_name = rs.getString(1);
if (var_name.equals("<state>"))
+ {
continue;
- else
- replyMSG.append("<tr><td>"+var_name+"</td><td>"+rs.getString(2)+"</td><td><edit var=\"var"+var_name+"\" width=80 height=15></td><td><button value=\"Set\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+val[1]+" "+var_name+" $var"+var_name+"\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><button value=\"Del\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+val[1]+" "+var_name+" delete\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr>");
+ }
+ replyMSG.append("<tr><td>"+var_name+"</td><td>"+rs.getString(2)+"</td><td><edit var=\"var"+var_name+"\" width=80 height=15></td><td><button value=\"Set\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+val[1]+" "+var_name+" $var"+var_name+"\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><button value=\"Del\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+val[1]+" "+var_name+" delete\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr>");
}
replyMSG.append("</table><br><br><table width=250><tr><td>Repeatable quest:</td><td>Unrepeatable quest:</td></tr>");
replyMSG.append("<tr><td><button value=\"Quest Complete\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+val[1]+" state COMLETED 1\" width=120 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>");
@@ -241,9 +242,10 @@ public class AdminShowQuests implements IAdminCommandHandler
{
String var_name = rs.getString(1);
if (var_name.equals("<state>"))
+ {
continue;
- else
- replyMSG.append("<tr><td>"+var_name+"</td><td>"+rs.getString(2)+"</td><td><edit var=\"var"+var_name+"\" width=80 height=15></td><td><button value=\"Set\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+qname+" "+var_name+" $var"+var_name+"\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><button value=\"Del\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+qname+" "+var_name+" delete\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr>");
+ }
+ replyMSG.append("<tr><td>"+var_name+"</td><td>"+rs.getString(2)+"</td><td><edit var=\"var"+var_name+"\" width=80 height=15></td><td><button value=\"Set\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+qname+" "+var_name+" $var"+var_name+"\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td><button value=\"Del\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+qname+" "+var_name+" delete\" width=30 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr>");
}
replyMSG.append("</table><br><br><table width=250><tr><td>Repeatable quest:</td><td>Unrepeatable quest:</td></tr>");
replyMSG.append("<tr><td><button value=\"Quest Complete\" action=\"bypass -h admin_setcharquest "+target.getName()+" "+qname+" state COMLETED 1\" width=100 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>");
@@ -337,6 +339,7 @@ public class AdminShowQuests implements IAdminCommandHandler
{};
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java
index d272bbeafb..7060077b0b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java
@@ -43,6 +43,7 @@ public class AdminShutdown implements IAdminCommandHandler
"admin_server_abort"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.startsWith("admin_server_shutdown"))
@@ -77,6 +78,7 @@ public class AdminShutdown implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
index 8ad8fe36ca..180aa423f0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
@@ -67,6 +67,7 @@ public class AdminSiege implements IAdminCommandHandler
"admin_clanhallteleportself"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
StringTokenizer st = new StringTokenizer(command, " ");
@@ -420,6 +421,7 @@ public class AdminSiege implements IAdminCommandHandler
activeChar.sendPacket(msg);
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 9bb3951b92..f380adc019 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -74,6 +74,7 @@ public class AdminSkill implements IAdminCommandHandler
private static L2Skill[] adminSkills;
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.equals("admin_show_skills"))
@@ -185,7 +186,8 @@ public class AdminSkill implements IAdminCommandHandler
/**
* This function will give all the skills that the target can learn at his/her level
- * @param activeChar: the gm char
+ * @param activeChar the active char
+ * @param includedByFs if {@code true} Forgotten Scroll skills will be delivered.
*/
private void adminGiveAllSkills(L2PcInstance activeChar, boolean includedByFs)
{
@@ -203,6 +205,7 @@ public class AdminSkill implements IAdminCommandHandler
player.sendSkillList();
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
@@ -490,36 +493,29 @@ public class AdminSkill implements IAdminCommandHandler
showMainPage(activeChar);
return;
}
- else
+
+ final L2Skill skill = SkillTable.getInstance().getInfo(id, level);
+ if (skill == null)
{
- L2Skill skill = SkillTable.getInstance().getInfo(id, level);
- if (skill != null)
- {
- String skillname = skill.getName();
- SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_SKILL_S1_ADDED);
- sm.addSkillName(skill);
- player.sendPacket(sm);
- final L2Clan clan = player.getClan();
- clan.broadcastToOnlineMembers(sm);
- clan.addNewSkill(skill);
- activeChar.sendMessage("You gave the Clan Skill: " + skillname + " to the clan " + clan.getName() + ".");
-
- clan.broadcastToOnlineMembers(new PledgeSkillList(clan));
- for (L2PcInstance member : clan.getOnlineMembers(0))
- {
- member.sendSkillList();
- }
-
- showMainPage(activeChar);
- return;
- }
- else
- {
- activeChar.sendMessage("Error: there is no such skill.");
- return;
- }
-
+ activeChar.sendMessage("Error: there is no such skill.");
+ }
+
+ String skillname = skill.getName();
+ SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_SKILL_S1_ADDED);
+ sm.addSkillName(skill);
+ player.sendPacket(sm);
+ final L2Clan clan = player.getClan();
+ clan.broadcastToOnlineMembers(sm);
+ clan.addNewSkill(skill);
+ activeChar.sendMessage("You gave the Clan Skill: " + skillname + " to the clan " + clan.getName() + ".");
+
+ clan.broadcastToOnlineMembers(new PledgeSkillList(clan));
+ for (L2PcInstance member : clan.getOnlineMembers(0))
+ {
+ member.sendSkillList();
}
+
+ showMainPage(activeChar);
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index 0f651c16b9..e8aee04a03 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -47,7 +47,6 @@ import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
import com.l2jserver.gameserver.util.Broadcast;
import com.l2jserver.util.StringUtil;
-
/**
* This class handles following admin commands: - show_spawns = shows menu -
* spawn_index lvl = shows menu for monsters with respective level -
@@ -57,6 +56,7 @@ import com.l2jserver.util.StringUtil;
*/
public class AdminSpawn implements IAdminCommandHandler
{
+ private static final Logger _log = Logger.getLogger(AdminSpawn.class.getName());
private static final String[] ADMIN_COMMANDS =
{
@@ -80,8 +80,8 @@ public class AdminSpawn implements IAdminCommandHandler
"admin_spawn_debug_print",
"admin_spawn_debug_print_menu"
};
- public static Logger _log = Logger.getLogger(AdminSpawn.class.getName());
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.equals("admin_show_spawns"))
@@ -303,6 +303,7 @@ public class AdminSpawn implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTarget.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTarget.java
index c6ffd0bfdb..18658d65b8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTarget.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTarget.java
@@ -31,6 +31,7 @@ public class AdminTarget implements IAdminCommandHandler
"admin_target"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.startsWith("admin_target"))
@@ -38,6 +39,7 @@ public class AdminTarget implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java
index e5b210100b..368dd83c87 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java
@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
*/
public class AdminTargetSay implements IAdminCommandHandler
{
-
private static final String[] ADMIN_COMMANDS =
{
"admin_targetsay"
@@ -42,19 +41,17 @@ public class AdminTargetSay implements IAdminCommandHandler
{
try
{
- String message = command.substring(16);
-
- L2Object obj = activeChar.getTarget();
-
+ final L2Object obj = activeChar.getTarget();
if ((obj instanceof L2ControllableMobInstance) || !(obj instanceof L2Character))
{
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return false;
}
- else
- {
- talk(activeChar, (L2Character) obj, message);
- }
+
+ final String message = command.substring(16);
+ final L2Character target = (L2Character) obj;
+
+ target.broadcastPacket(new CreatureSay(target.getObjectId(), Say2.ALL, target.getName(), message));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -65,11 +62,6 @@ public class AdminTargetSay implements IAdminCommandHandler
return true;
}
- private void talk(L2PcInstance activeChar, L2Character target, String message)
- {
- target.broadcastPacket(new CreatureSay(target.getObjectId(), Say2.ALL, target.getName(), message));
- }
-
@Override
public String[] getAdminCommandList()
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index c56b641067..e054e38448 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -41,7 +41,6 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
import com.l2jserver.util.StringUtil;
-
/**
* This class handles following admin commands:
* - show_moves
@@ -82,6 +81,7 @@ public class AdminTeleport implements IAdminCommandHandler
"admin_instant_move"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.equals("admin_teleto"))
@@ -246,6 +246,7 @@ public class AdminTeleport implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
@@ -364,6 +365,7 @@ public class AdminTeleport implements IAdminCommandHandler
* @param x
* @param y
* @param z
+ * @param activeChar
*/
private void teleportCharacter(L2PcInstance player, int x, int y, int z, L2PcInstance activeChar)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java
index 41771e9b58..b2b576bf92 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java
@@ -43,9 +43,7 @@ public class AdminTest implements IAdminCommandHandler
"admin_known"
};
- /* (non-Javadoc)
- * @see com.l2jserver.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, com.l2jserver.gameserver.model.L2PcInstance)
- */
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.equals("admin_stats"))
@@ -90,6 +88,7 @@ public class AdminTest implements IAdminCommandHandler
/**
* @param activeChar
* @param id
+ * @param msu
*/
private void adminTestSkill(L2PcInstance activeChar, int id, boolean msu)
{
@@ -114,6 +113,7 @@ public class AdminTest implements IAdminCommandHandler
/* (non-Javadoc)
* @see com.l2jserver.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
*/
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java
index 7609b54cd6..7c69eccd32 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java
@@ -34,6 +34,7 @@ public class AdminTvTEvent implements IAdminCommandHandler
"admin_tvt_advance"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.equals("admin_tvt_add"))
@@ -68,6 +69,7 @@ public class AdminTvTEvent implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java
index 6b96ed324c..b2f35d36b4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java
@@ -19,7 +19,6 @@ import java.util.logging.Logger;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-
/**
* This class handles following admin commands:
* <ul>
@@ -30,8 +29,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
*/
public class AdminUnblockIp implements IAdminCommandHandler
{
-
- private static final Logger _log = Logger.getLogger(AdminTeleport.class.getName());
+ private static final Logger _log = Logger.getLogger(AdminUnblockIp.class.getName());
private static final String[] ADMIN_COMMANDS =
{
@@ -39,9 +37,9 @@ public class AdminUnblockIp implements IAdminCommandHandler
};
/**
- *
* @see com.l2jserver.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
@@ -65,6 +63,7 @@ public class AdminUnblockIp implements IAdminCommandHandler
return true;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminVitality.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminVitality.java
index 19180880e6..cf9d7d2079 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminVitality.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminVitality.java
@@ -36,6 +36,7 @@ public class AdminVitality implements IAdminCommandHandler
"admin_get_vitality"
};
+ @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (activeChar == null)
@@ -115,13 +116,11 @@ public class AdminVitality implements IAdminCommandHandler
}
return true;
}
- else
- {
- activeChar.sendMessage("Target not found or not a player");
- return false;
- }
+ activeChar.sendMessage("Target not found or not a player");
+ return false;
}
+ @Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
index 96efd47d84..662fecb5af 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
@@ -61,283 +61,281 @@ public class Festival implements IBypassHandler
npc.showChatWindow(activeChar, val, null, true);
return true;
}
- else
+
+ final L2Party party;
+ val = Integer.parseInt(command.substring(9, 10));
+ switch (val)
{
- final L2Party party;
- val = Integer.parseInt(command.substring(9, 10));
- switch (val)
- {
- case 1: // Become a Participant
- // Check if the festival period is active, if not then don't allow registration.
- if (SevenSigns.getInstance().isSealValidationPeriod())
- {
- npc.showChatWindow(activeChar, 2, "a", false);
- return true;
- }
-
- // Check if a festival is in progress, then don't allow registration yet.
- if (SevenSignsFestival.getInstance().isFestivalInitialized())
- {
- activeChar.sendMessage("You cannot sign up while a festival is in progress.");
- return true;
- }
-
- // Check if the player is in a formed party already.
- if (!activeChar.isInParty())
- {
- npc.showChatWindow(activeChar, 2, "b", false);
- return true;
- }
-
- party = activeChar.getParty();
-
- // Check if the player is the party leader.
- if (!party.isLeader(activeChar))
- {
- npc.showChatWindow(activeChar, 2, "c", false);
- return true;
- }
-
- // Check to see if the party has at least 5 members.
- if (party.getMemberCount() < Config.ALT_FESTIVAL_MIN_PLAYER)
- {
- npc.showChatWindow(activeChar, 2, "b", false);
- return true;
- }
-
- // Check if all the party members are in the required level range.
- if (party.getLevel() > SevenSignsFestival.getMaxLevelForFestival(npc.getFestivalType()))
- {
- npc.showChatWindow(activeChar, 2, "d", false);
- return true;
- }
-
- // Check to see if the player has already signed up
- if (activeChar.isFestivalParticipant())
- {
- SevenSignsFestival.getInstance().setParticipants(npc.getFestivalOracle(), npc.getFestivalType(), party);
- npc.showChatWindow(activeChar, 2, "f", false);
- return true;
- }
-
- npc.showChatWindow(activeChar, 1, null, false);
- break;
- case 2: // Seal Stones
- final int stoneType = Integer.parseInt(command.substring(11));
- final int stoneCount = npc.getStoneCount(stoneType);
- if (stoneCount <= 0)
- {
- return false;
- }
-
- if (!activeChar.destroyItemByItemId("SevenSigns", stoneType, stoneCount, npc, true))
- {
- return false;
- }
-
- SevenSignsFestival.getInstance().setParticipants(npc.getFestivalOracle(), npc.getFestivalType(), activeChar.getParty());
- SevenSignsFestival.getInstance().addAccumulatedBonus(npc.getFestivalType(), stoneType, stoneCount);
-
- npc.showChatWindow(activeChar, 2, "e", false);
- break;
- case 3: // Score Registration
- // Check if the festival period is active, if not then don't register the score.
- if (SevenSigns.getInstance().isSealValidationPeriod())
- {
- npc.showChatWindow(activeChar, 3, "a", false);
- return true;
- }
-
- // Check if a festival is in progress, if it is don't register the score.
- if (SevenSignsFestival.getInstance().isFestivalInProgress())
- {
- activeChar.sendMessage("You cannot register a score while a festival is in progress.");
- return true;
- }
-
- // Check if the player is in a party.
- if (!activeChar.isInParty())
- {
- npc.showChatWindow(activeChar, 3, "b", false);
- return true;
- }
-
- final List<Integer> prevParticipants = SevenSignsFestival.getInstance().getPreviousParticipants(npc.getFestivalOracle(), npc.getFestivalType());
-
- // Check if there are any past participants.
- if ((prevParticipants == null) || prevParticipants.isEmpty() || !prevParticipants.contains(activeChar.getObjectId()))
- {
- npc.showChatWindow(activeChar, 3, "b", false);
- return true;
- }
-
- // Check if this player was the party leader in the festival.
- if (activeChar.getObjectId() != prevParticipants.get(0))
- {
- npc.showChatWindow(activeChar, 3, "b", false);
- return true;
- }
-
- final L2ItemInstance bloodOfferings = activeChar.getInventory().getItemByItemId(SevenSignsFestival.FESTIVAL_OFFERING_ID);
-
- // Check if the player collected any blood offerings during the festival.
- if (bloodOfferings == null)
- {
- activeChar.sendMessage("You do not have any blood offerings to contribute.");
- return true;
- }
-
- final long offeringScore = bloodOfferings.getCount() * SevenSignsFestival.FESTIVAL_OFFERING_VALUE;
- if (!activeChar.destroyItem("SevenSigns", bloodOfferings, npc, false))
- {
- return true;
- }
-
- final boolean isHighestScore = SevenSignsFestival.getInstance().setFinalScore(activeChar, npc.getFestivalOracle(), npc.getFestivalType(), offeringScore);
- SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CONTRIB_SCORE_INCREASED_S1);
- sm.addItemNumber(offeringScore);
- activeChar.sendPacket(sm);
-
- if (isHighestScore)
- {
- npc.showChatWindow(activeChar, 3, "c", false);
+ case 1: // Become a Participant
+ // Check if the festival period is active, if not then don't allow registration.
+ if (SevenSigns.getInstance().isSealValidationPeriod())
+ {
+ npc.showChatWindow(activeChar, 2, "a", false);
+ return true;
+ }
+
+ // Check if a festival is in progress, then don't allow registration yet.
+ if (SevenSignsFestival.getInstance().isFestivalInitialized())
+ {
+ activeChar.sendMessage("You cannot sign up while a festival is in progress.");
+ return true;
+ }
+
+ // Check if the player is in a formed party already.
+ if (!activeChar.isInParty())
+ {
+ npc.showChatWindow(activeChar, 2, "b", false);
+ return true;
+ }
+
+ party = activeChar.getParty();
+
+ // Check if the player is the party leader.
+ if (!party.isLeader(activeChar))
+ {
+ npc.showChatWindow(activeChar, 2, "c", false);
+ return true;
+ }
+
+ // Check to see if the party has at least 5 members.
+ if (party.getMemberCount() < Config.ALT_FESTIVAL_MIN_PLAYER)
+ {
+ npc.showChatWindow(activeChar, 2, "b", false);
+ return true;
+ }
+
+ // Check if all the party members are in the required level range.
+ if (party.getLevel() > SevenSignsFestival.getMaxLevelForFestival(npc.getFestivalType()))
+ {
+ npc.showChatWindow(activeChar, 2, "d", false);
+ return true;
+ }
+
+ // Check to see if the player has already signed up
+ if (activeChar.isFestivalParticipant())
+ {
+ SevenSignsFestival.getInstance().setParticipants(npc.getFestivalOracle(), npc.getFestivalType(), party);
+ npc.showChatWindow(activeChar, 2, "f", false);
+ return true;
+ }
+
+ npc.showChatWindow(activeChar, 1, null, false);
+ break;
+ case 2: // Seal Stones
+ final int stoneType = Integer.parseInt(command.substring(11));
+ final int stoneCount = npc.getStoneCount(stoneType);
+ if (stoneCount <= 0)
+ {
+ return false;
+ }
+
+ if (!activeChar.destroyItemByItemId("SevenSigns", stoneType, stoneCount, npc, true))
+ {
+ return false;
+ }
+
+ SevenSignsFestival.getInstance().setParticipants(npc.getFestivalOracle(), npc.getFestivalType(), activeChar.getParty());
+ SevenSignsFestival.getInstance().addAccumulatedBonus(npc.getFestivalType(), stoneType, stoneCount);
+
+ npc.showChatWindow(activeChar, 2, "e", false);
+ break;
+ case 3: // Score Registration
+ // Check if the festival period is active, if not then don't register the score.
+ if (SevenSigns.getInstance().isSealValidationPeriod())
+ {
+ npc.showChatWindow(activeChar, 3, "a", false);
+ return true;
+ }
+
+ // Check if a festival is in progress, if it is don't register the score.
+ if (SevenSignsFestival.getInstance().isFestivalInProgress())
+ {
+ activeChar.sendMessage("You cannot register a score while a festival is in progress.");
+ return true;
+ }
+
+ // Check if the player is in a party.
+ if (!activeChar.isInParty())
+ {
+ npc.showChatWindow(activeChar, 3, "b", false);
+ return true;
+ }
+
+ final List<Integer> prevParticipants = SevenSignsFestival.getInstance().getPreviousParticipants(npc.getFestivalOracle(), npc.getFestivalType());
+
+ // Check if there are any past participants.
+ if ((prevParticipants == null) || prevParticipants.isEmpty() || !prevParticipants.contains(activeChar.getObjectId()))
+ {
+ npc.showChatWindow(activeChar, 3, "b", false);
+ return true;
+ }
+
+ // Check if this player was the party leader in the festival.
+ if (activeChar.getObjectId() != prevParticipants.get(0))
+ {
+ npc.showChatWindow(activeChar, 3, "b", false);
+ return true;
+ }
+
+ final L2ItemInstance bloodOfferings = activeChar.getInventory().getItemByItemId(SevenSignsFestival.FESTIVAL_OFFERING_ID);
+
+ // Check if the player collected any blood offerings during the festival.
+ if (bloodOfferings == null)
+ {
+ activeChar.sendMessage("You do not have any blood offerings to contribute.");
+ return true;
+ }
+
+ final long offeringScore = bloodOfferings.getCount() * SevenSignsFestival.FESTIVAL_OFFERING_VALUE;
+ if (!activeChar.destroyItem("SevenSigns", bloodOfferings, npc, false))
+ {
+ return true;
+ }
+
+ final boolean isHighestScore = SevenSignsFestival.getInstance().setFinalScore(activeChar, npc.getFestivalOracle(), npc.getFestivalType(), offeringScore);
+ SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CONTRIB_SCORE_INCREASED_S1);
+ sm.addItemNumber(offeringScore);
+ activeChar.sendPacket(sm);
+
+ if (isHighestScore)
+ {
+ npc.showChatWindow(activeChar, 3, "c", false);
+ }
+ else
+ {
+ npc.showChatWindow(activeChar, 3, "d", false);
+ }
+ break;
+ case 4: // Current High Scores
+ final StringBuilder strBuffer = StringUtil.startAppend(500, "<html><body>Festival Guide:<br>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 int dawnScore = dawnData.getInteger("score");
+ final int duskScore = duskData.getInteger("score");
+ int overallScore = 0;
+
+ // If no data is returned, assume there is no record, or all scores are 0.
+ if (overallData != null)
+ {
+ overallScore = overallData.getInteger("score");
+ }
+
+ StringUtil.append(strBuffer, SevenSignsFestival.getFestivalName(npc.getFestivalType()), " festival.<br>");
+
+ if (dawnScore > 0)
+ {
+ StringUtil.append(strBuffer, "Dawn: ", calculateDate(dawnData.getString("date")), ". Score ", String.valueOf(dawnScore), "<br>", dawnData.getString("members"), "<br>");
+ }
+ else
+ {
+ strBuffer.append("Dawn: No record exists. Score 0<br>");
+ }
+
+ if (duskScore > 0)
+ {
+ StringUtil.append(strBuffer, "Dusk: ", calculateDate(duskData.getString("date")), ". Score ", String.valueOf(duskScore), "<br>", duskData.getString("members"), "<br>");
+ }
+ else
+ {
+ strBuffer.append("Dusk: No record exists. Score 0<br>");
+ }
+
+ if (overallScore > 0)
+ {
+ final String cabalStr;
+ if (overallData.getString("cabal").equals("dawn"))
+ {
+ cabalStr = "Children of Dawn";
}
else
{
- npc.showChatWindow(activeChar, 3, "d", false);
- }
- break;
- case 4: // Current High Scores
- final StringBuilder strBuffer = StringUtil.startAppend(500, "<html><body>Festival Guide:<br>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 int dawnScore = dawnData.getInteger("score");
- final int duskScore = duskData.getInteger("score");
- int overallScore = 0;
-
- // If no data is returned, assume there is no record, or all scores are 0.
- if (overallData != null)
- {
- overallScore = overallData.getInteger("score");
- }
-
- StringUtil.append(strBuffer, SevenSignsFestival.getFestivalName(npc.getFestivalType()), " festival.<br>");
-
- if (dawnScore > 0)
- {
- StringUtil.append(strBuffer, "Dawn: ", calculateDate(dawnData.getString("date")), ". Score ", String.valueOf(dawnScore), "<br>", dawnData.getString("members"), "<br>");
- }
- else
- {
- strBuffer.append("Dawn: No record exists. Score 0<br>");
- }
-
- if (duskScore > 0)
- {
- StringUtil.append(strBuffer, "Dusk: ", calculateDate(duskData.getString("date")), ". Score ", String.valueOf(duskScore), "<br>", duskData.getString("members"), "<br>");
- }
- else
- {
- strBuffer.append("Dusk: No record exists. Score 0<br>");
- }
-
- if (overallScore > 0)
- {
- final String cabalStr;
- if (overallData.getString("cabal").equals("dawn"))
- {
- cabalStr = "Children of Dawn";
- }
- else
- {
- cabalStr = "Children of Dusk";
- }
-
- StringUtil.append(strBuffer, "Consecutive top scores: ", calculateDate(overallData.getString("date")), ". Score ", String.valueOf(overallScore), "<br>Affilated side: ", cabalStr, "<br>", overallData.getString("members"), "<br>");
- }
- else
- {
- strBuffer.append("Consecutive top scores: No record exists. Score 0<br>");
- }
-
- StringUtil.append(strBuffer, "<a action=\"bypass -h npc_", String.valueOf(npc.getObjectId()), "_Chat 0\">Go back.</a></body></html>");
-
- NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
- html.setHtml(strBuffer.toString());
- activeChar.sendPacket(html);
- break;
- case 8: // Increase the Festival Challenge
- if (!activeChar.isInParty())
- {
- return true;
- }
-
- if (!SevenSignsFestival.getInstance().isFestivalInProgress())
- {
- return true;
- }
-
- party = activeChar.getParty();
- if (!party.isLeader(activeChar))
- {
- npc.showChatWindow(activeChar, 8, "a", false);
- return true;
- }
-
- if (SevenSignsFestival.getInstance().increaseChallenge(npc.getFestivalOracle(), npc.getFestivalType()))
- {
- npc.showChatWindow(activeChar, 8, "b", false);
+ cabalStr = "Children of Dusk";
+ }
+
+ StringUtil.append(strBuffer, "Consecutive top scores: ", calculateDate(overallData.getString("date")), ". Score ", String.valueOf(overallScore), "<br>Affilated side: ", cabalStr, "<br>", overallData.getString("members"), "<br>");
+ }
+ else
+ {
+ strBuffer.append("Consecutive top scores: No record exists. Score 0<br>");
+ }
+
+ StringUtil.append(strBuffer, "<a action=\"bypass -h npc_", String.valueOf(npc.getObjectId()), "_Chat 0\">Go back.</a></body></html>");
+
+ NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
+ html.setHtml(strBuffer.toString());
+ activeChar.sendPacket(html);
+ break;
+ case 8: // Increase the Festival Challenge
+ if (!activeChar.isInParty())
+ {
+ return true;
+ }
+
+ if (!SevenSignsFestival.getInstance().isFestivalInProgress())
+ {
+ return true;
+ }
+
+ party = activeChar.getParty();
+ if (!party.isLeader(activeChar))
+ {
+ npc.showChatWindow(activeChar, 8, "a", false);
+ return true;
+ }
+
+ if (SevenSignsFestival.getInstance().increaseChallenge(npc.getFestivalOracle(), npc.getFestivalType()))
+ {
+ npc.showChatWindow(activeChar, 8, "b", false);
+ }
+ else
+ {
+ npc.showChatWindow(activeChar, 8, "c", false);
+ }
+ break;
+ case 9: // Leave the Festival
+ if (!activeChar.isInParty())
+ {
+ return true;
+ }
+
+ party = activeChar.getParty();
+ if (party.isLeader(activeChar))
+ {
+ SevenSignsFestival.getInstance().updateParticipants(activeChar, null);
+ }
+ else
+ {
+ if (party.getMemberCount() > Config.ALT_FESTIVAL_MIN_PLAYER)
+ {
+ party.removePartyMember(activeChar, messageType.Expelled);
}
else
{
- npc.showChatWindow(activeChar, 8, "c", false);
- }
- break;
- case 9: // Leave the Festival
- if (!activeChar.isInParty())
- {
- return true;
- }
-
- party = activeChar.getParty();
- if (party.isLeader(activeChar))
- {
- SevenSignsFestival.getInstance().updateParticipants(activeChar, null);
- }
- else
- {
- if (party.getMemberCount() > Config.ALT_FESTIVAL_MIN_PLAYER)
- {
- party.removePartyMember(activeChar, messageType.Expelled);
- }
- else
- {
- activeChar.sendMessage("Only the party leader can leave a festival when a party has minimum number of members.");
- }
- }
- break;
- case 0: // Distribute Accumulated Bonus
- if (!SevenSigns.getInstance().isSealValidationPeriod())
- {
- activeChar.sendMessage("Bonuses cannot be paid during the competition period.");
- return true;
- }
-
- if (SevenSignsFestival.getInstance().distribAccumulatedBonus(activeChar) > 0)
- {
- npc.showChatWindow(activeChar, 0, "a", false);
- }
- else
- {
- npc.showChatWindow(activeChar, 0, "b", false);
- }
- break;
- default:
- npc.showChatWindow(activeChar, val, null, false);
- }
+ activeChar.sendMessage("Only the party leader can leave a festival when a party has minimum number of members.");
+ }
+ }
+ break;
+ case 0: // Distribute Accumulated Bonus
+ if (!SevenSigns.getInstance().isSealValidationPeriod())
+ {
+ activeChar.sendMessage("Bonuses cannot be paid during the competition period.");
+ return true;
+ }
+
+ if (SevenSignsFestival.getInstance().distribAccumulatedBonus(activeChar) > 0)
+ {
+ npc.showChatWindow(activeChar, 0, "a", false);
+ }
+ else
+ {
+ npc.showChatWindow(activeChar, 0, "b", false);
+ }
+ break;
+ default:
+ npc.showChatWindow(activeChar, val, null, false);
}
return true;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java
index e32f7214f0..41413d4d3f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/FortSiege.java
@@ -71,10 +71,8 @@ public class FortSiege implements IBypassHandler
}
return false;
}
- else
- {
- ((L2Npc) target).showChatWindow(activeChar, 10);
- }
+
+ ((L2Npc) target).showChatWindow(activeChar, 10);
return true;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
index b01d0ba016..c1b1cbeaef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
@@ -203,32 +203,29 @@ public class OlympiadObservation implements IBypassHandler
activeChar.sendPacket(message);
return true;
}
- else
- // change
+
+ if (isManager)
{
- if (isManager)
+ if (OlympiadManager.getInstance().isRegisteredInComp(activeChar))
{
- if (OlympiadManager.getInstance().isRegisteredInComp(activeChar))
- {
- activeChar.sendPacket(SystemMessageId.WHILE_YOU_ARE_ON_THE_WAITING_LIST_YOU_ARE_NOT_ALLOWED_TO_WATCH_THE_GAME);
- return false;
- }
- if (!TvTEvent.isInactive() && TvTEvent.isPlayerParticipant(activeChar.getObjectId()))
- {
- activeChar.sendMessage("You can not observe games while registered for TvT");
- return false;
- }
+ activeChar.sendPacket(SystemMessageId.WHILE_YOU_ARE_ON_THE_WAITING_LIST_YOU_ARE_NOT_ALLOWED_TO_WATCH_THE_GAME);
+ return false;
}
-
- final int arenaId = Integer.parseInt(command.substring(12).trim());
- final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(arenaId);
- if (nextArena != null)
+ if (!TvTEvent.isInactive() && TvTEvent.isPlayerParticipant(activeChar.getObjectId()))
{
- activeChar.enterOlympiadObserverMode(nextArena.getZone().getSpawns().get(0), arenaId);
- activeChar.setInstanceId(OlympiadGameManager.getInstance().getOlympiadTask(arenaId).getZone().getInstanceId());
- return true;
+ activeChar.sendMessage("You can not observe games while registered for TvT");
+ return false;
}
}
+
+ final int arenaId = Integer.parseInt(command.substring(12).trim());
+ final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(arenaId);
+ if (nextArena != null)
+ {
+ activeChar.enterOlympiadObserverMode(nextArena.getZone().getSpawns().get(0), arenaId);
+ activeChar.setInstanceId(OlympiadGameManager.getInstance().getOlympiadTask(arenaId).getZone().getInstanceId());
+ return true;
+ }
}
catch (Exception e)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveDeathPenalty.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveDeathPenalty.java
index 9fc29dbb06..4d25b49feb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveDeathPenalty.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveDeathPenalty.java
@@ -74,10 +74,7 @@ public class RemoveDeathPenalty implements IBypassHandler
activeChar.sendPacket(new EtcStatusUpdate(activeChar));
return true;
}
- else
- {
- replyMSG.append("The wound you have received from death's touch is too deep to be healed for the money you have to give me. Find more money if you wish death's mark to be fully removed from you.");
- }
+ replyMSG.append("The wound you have received from death's touch is too deep to be healed for the money you have to give me. Find more money if you wish death's mark to be fully removed from you.");
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java
index 80d11bc6ab..e76ee262cb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java
@@ -64,6 +64,9 @@ public class SupportMagic implements IBypassHandler
* <FONT COLOR=#FF0000><B> Newbie Helper Buff list is define in sql table helper_buff_list</B></FONT><BR>
* <BR>
* @param player The L2PcInstance that talk with the L2NpcInstance
+ * @param npc
+ * @param isSummon
+ * @return
*/
public static boolean makeSupportMagic(L2PcInstance player, L2Npc npc, boolean isSummon)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAll.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAll.java
index 7eceecd93a..e35b4ad9a9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAll.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAll.java
@@ -45,7 +45,7 @@ public class ChatAll implements IChatHandler
/**
* Handle chat type 'all'
- * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+ * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
*/
@Override
public void handleChat(int type, L2PcInstance activeChar, String params, String text)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java
index e599727c87..9b18faf4cf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java
@@ -30,8 +30,9 @@ public class ChatAlliance implements IChatHandler
/**
* Handle chat type 'alliance'
- * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+ * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
*/
+ @Override
public void handleChat(int type, L2PcInstance activeChar, String target, String text)
{
if (activeChar.getClan() != null)
@@ -51,6 +52,7 @@ public class ChatAlliance implements IChatHandler
* Returns the chat types registered to this handler
* @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
*/
+ @Override
public int[] getChatTypeList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java
index fb44dfc660..d92e4e10b9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java
@@ -37,7 +37,7 @@ public class ChatBattlefield implements IChatHandler
/**
* Handle chat type 'battlefield'
- * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+ * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
*/
@Override
public void handleChat(int type, L2PcInstance activeChar, String target, String text)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatClan.java
index 590ee1f020..cecec4f944 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatClan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatClan.java
@@ -35,8 +35,9 @@ public class ChatClan implements IChatHandler
/**
* Handle chat type 'clan'
- * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+ * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
*/
+ @Override
public void handleChat(int type, L2PcInstance activeChar, String target, String text)
{
if (activeChar.getClan() != null)
@@ -56,6 +57,7 @@ public class ChatClan implements IChatHandler
* Returns the chat types registered to this handler
* @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
*/
+ @Override
public int[] getChatTypeList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java
index c0937bd171..b1dbf4bb64 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java
@@ -38,7 +38,7 @@ public class ChatHeroVoice implements IChatHandler
/**
* Handle chat type 'hero voice'
- * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+ * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
*/
@Override
public void handleChat(int type, L2PcInstance activeChar, String target, String text)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatParty.java
index 41e9c160d5..77e15f0b50 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatParty.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatParty.java
@@ -35,8 +35,9 @@ public class ChatParty implements IChatHandler
/**
* Handle chat type 'party'
- * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+ * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
*/
+ @Override
public void handleChat(int type, L2PcInstance activeChar, String target, String text)
{
if (activeChar.isInParty())
@@ -56,6 +57,7 @@ public class ChatParty implements IChatHandler
* Returns the chat types registered to this handler
* @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
*/
+ @Override
public int[] getChatTypeList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java
index 26abaa3f5f..d081452f45 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java
@@ -36,7 +36,9 @@ public class ChatPartyMatchRoom implements IChatHandler
/**
* Handle chat type 'partymatchroom'
+ * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
*/
+ @Override
public void handleChat(int type, L2PcInstance activeChar, String target, String text)
{
if (activeChar.isInPartyMatchRoom())
@@ -62,6 +64,7 @@ public class ChatPartyMatchRoom implements IChatHandler
/**
* Returns the chat types registered to this handler
*/
+ @Override
public int[] getChatTypeList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java
index e94792b42e..7bbf419398 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java
@@ -35,8 +35,9 @@ public class ChatPartyRoomAll implements IChatHandler
/**
* Handle chat type 'party room all'
- * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+ * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
*/
+ @Override
public void handleChat(int type, L2PcInstance activeChar, String target, String text)
{
if (activeChar.isInParty())
@@ -59,6 +60,7 @@ public class ChatPartyRoomAll implements IChatHandler
* Returns the chat types registered to this handler
* @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
*/
+ @Override
public int[] getChatTypeList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java
index 5c8bbcdd44..565d0bc196 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java
@@ -35,8 +35,9 @@ public class ChatPartyRoomCommander implements IChatHandler
/**
* Handle chat type 'party room commander'
- * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+ * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
*/
+ @Override
public void handleChat(int type, L2PcInstance activeChar, String target, String text)
{
if (activeChar.isInParty())
@@ -59,6 +60,7 @@ public class ChatPartyRoomCommander implements IChatHandler
* Returns the chat types registered to this handler
* @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
*/
+ @Override
public int[] getChatTypeList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPetition.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPetition.java
index f9d3adb045..4c520a1324 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPetition.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatPetition.java
@@ -36,8 +36,9 @@ public class ChatPetition implements IChatHandler
/**
* Handle chat type 'petition player'
- * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+ * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
*/
+ @Override
public void handleChat(int type, L2PcInstance activeChar, String target, String text)
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
@@ -59,6 +60,7 @@ public class ChatPetition implements IChatHandler
* Returns the chat types registered to this handler
* @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
*/
+ @Override
public int[] getChatTypeList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatShout.java
index 29119b3123..91372958e2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatShout.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatShout.java
@@ -39,7 +39,7 @@ public class ChatShout implements IChatHandler
/**
* Handle chat type 'shout'
- * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+ * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
*/
@Override
public void handleChat(int type, L2PcInstance activeChar, String target, String text)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTell.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTell.java
index 2a01c4f806..53cf61ca5e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTell.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTell.java
@@ -37,8 +37,9 @@ public class ChatTell implements IChatHandler
/**
* Handle chat type 'tell'
- * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+ * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
*/
+ @Override
public void handleChat(int type, L2PcInstance activeChar, String target, String text)
{
if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
@@ -99,6 +100,7 @@ public class ChatTell implements IChatHandler
* Returns the chat types registered to this handler
* @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
*/
+ @Override
public int[] getChatTypeList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java
index a5236e1248..8a33f2eeb9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java
@@ -39,7 +39,7 @@ public class ChatTrade implements IChatHandler
/**
* Handle chat type 'trade'
- * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+ * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
*/
@Override
public void handleChat(int type, L2PcInstance activeChar, String target, String text)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fusion.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fusion.java
index 20f3c034e7..d1b974eb82 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fusion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fusion.java
@@ -55,6 +55,7 @@ public class Fusion extends L2Effect
return L2EffectType.FUSION;
}
+ @Override
public void increaseEffect()
{
if (_effect < _maxEffect)
@@ -64,6 +65,7 @@ public class Fusion extends L2Effect
}
}
+ @Override
public void decreaseForce()
{
_effect--;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java
index 3a54c0f3ff..f69ba35a55 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java
@@ -33,8 +33,9 @@ public class BeastSoulShot implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (playable == null)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java
index fee83cd52d..bb7f480251 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java
@@ -27,8 +27,9 @@ public class BeastSpice implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java
index 608777eb77..158190f603 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java
@@ -33,8 +33,9 @@ public class BeastSpiritShot implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (playable == null)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java
index ee28fbce34..5a635929af 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java
@@ -34,8 +34,9 @@ public class BlessedSpiritShot implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public synchronized void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java
index 78589762be..2790e9589b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java
@@ -26,8 +26,9 @@ public class Book implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java
index fc32ca5513..2238db4cc7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java
@@ -27,8 +27,9 @@ public class ChristmasTree implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
L2PcInstance activeChar = (L2PcInstance) playable;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Disguise.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Disguise.java
index 9b4fc09895..f09875b4ad 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Disguise.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Disguise.java
@@ -32,8 +32,9 @@ public class Disguise implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java
index 8f4e7afff2..dfc770c3fe 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Elixir.java
@@ -23,7 +23,7 @@ public class Elixir extends ItemSkills
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
@Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java
index 2e72c4be8d..eedcb4f9ca 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java
@@ -23,6 +23,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExChooseInventoryAttribute
public class EnchantAttribute implements IItemHandler
{
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java
index 1975e8dfa6..63b46db675 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java
@@ -25,8 +25,9 @@ public class EnchantScrolls implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java
index 8efed471fd..c552451a57 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EnergyStarStone.java
@@ -27,7 +27,7 @@ public class EnergyStarStone extends ItemSkills
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
@Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java
index d59a0b385d..dac536d65b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java
@@ -21,7 +21,7 @@ public class EventItem implements IItemHandler
private static final Logger _log = Logger.getLogger(EventItem.class.getName());
/* (non-Javadoc)
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
@Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
index 285c282a07..99952d1dd5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
@@ -36,6 +36,7 @@ public class ExtractableItems implements IItemHandler
{
private static Logger _log = Logger.getLogger(ItemTable.class.getName());
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java
index d86054168c..603c349a82 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/FishShots.java
@@ -39,8 +39,9 @@ public class FishShots implements IItemHandler
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java
index d73177caf4..3089492c4b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Harvester.java
@@ -35,8 +35,9 @@ public class Harvester implements IItemHandler
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance _item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java
index fbfea9e44e..b3eacfa33a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java
@@ -26,7 +26,7 @@ public class ItemSkills extends ItemSkillsTemplate
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
@Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 50e38e4d8e..d691ccc911 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -30,6 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
import com.l2jserver.gameserver.network.serverpackets.ExUseSharedGroupItem;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.SkillHolder;
+import com.l2jserver.gameserver.templates.skills.L2SkillType;
import com.l2jserver.gameserver.util.L2TIntObjectHashMap;
/**
@@ -40,7 +41,7 @@ public class ItemSkillsTemplate implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
@Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
@@ -153,13 +154,21 @@ public class ItemSkillsTemplate implements IItemHandler
else
{
playable.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+
+ // TODO: Remove when reuse time for sub-class is implemented.
+ if (activeChar.isSubClassActive() && (itemSkill.getSkillType() == L2SkillType.EXTRACTABLE) && (itemSkill.getReuseDelay() > 5000) && (itemSkill.getItemConsumeId() == 0) && (itemSkill.getItemConsume() > 0))
+ {
+ activeChar.sendPacket(SystemMessageId.MAIN_CLASS_SKILL_ONLY);
+ return;
+ }
+
if (!playable.useMagic(itemSkill, forceUse, false))
return;
- //consume
+ // Consume.
if (itemSkill.getItemConsumeId() == 0 && itemSkill.getItemConsume() > 0)
{
- if (!playable.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), null, false))
+ if (!activeChar.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), null, false))
{
activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
return;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java
index b4549f5bd3..98d47eacd8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java
@@ -23,7 +23,7 @@ public class ManaPotion extends ItemSkills
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
@Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Maps.java
index 2359ce05e3..1be76f4f25 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Maps.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Maps.java
@@ -31,8 +31,9 @@ public class Maps implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java
index 6bcb7962db..f2da7e2f05 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java
@@ -22,6 +22,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExRequestChangeNicknameCol
public class NicknameColor implements IItemHandler
{
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java
index ae9758880f..94f38e02e9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PaganKeys.java
@@ -34,8 +34,9 @@ public class PaganKeys implements IItemHandler
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
int itemId = item.getItemId();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
index 98fb845d78..85416d98de 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/PetFood.java
@@ -33,6 +33,7 @@ import com.l2jserver.gameserver.util.Util;
*/
public class PetFood implements IItemHandler
{
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
int itemId = item.getItemId();
@@ -106,20 +107,14 @@ public class PetFood implements IItemHandler
}
return true;
}
- else
- {
- SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
- sm.addItemName(item);
- activeChar.sendPacket(sm);
- return false;
- }
- }
- else
- {
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
sm.addItemName(item);
activeChar.sendPacket(sm);
+ return false;
}
+ SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+ sm.addItemName(item);
+ activeChar.sendPacket(sm);
return false;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java
index 588a546e8b..461d460665 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java
@@ -28,6 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
*/
public class Recipes implements IItemHandler
{
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
index 897039abef..ebc7528f4f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
@@ -35,8 +35,9 @@ public class RollingDice implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java
index d02c5b598f..38521a8642 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ScrollOfResurrection.java
@@ -39,8 +39,9 @@ public class ScrollOfResurrection implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java
index 7a1d96aedd..aa15a76c89 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Seed.java
@@ -38,8 +38,9 @@ public class Seed implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java
index 5c66470dde..d78c5291da 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java
@@ -29,8 +29,9 @@ public class SevenSignsRecord implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java
index 1d4ec17415..81d1bd202f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java
@@ -27,6 +27,7 @@ import com.l2jserver.gameserver.util.Broadcast;
public class SoulShots implements IItemHandler
{
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java
index 5dce778408..25b50fe7fb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java
@@ -28,8 +28,9 @@ public class SpecialXMas implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java
index 4205e1d22b..62e75973dd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java
@@ -34,8 +34,9 @@ public class SpiritShot implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public synchronized void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
index 427d824f6c..f086ccfa6a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
@@ -51,8 +51,9 @@ public class SummonItems implements IItemHandler
{
/**
*
- * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+ * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
*/
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (!(playable instanceof L2PcInstance))
@@ -178,6 +179,7 @@ public class SummonItems implements IItemHandler
_petSummon = petSummon;
}
+ @Override
public void run()
{
try
@@ -208,6 +210,7 @@ public class SummonItems implements IItemHandler
_item = item;
}
+ @Override
public void run()
{
try
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java
index a381a099f4..55ad6091bf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java
@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
*/
public class TeleportBookmark implements IItemHandler
{
-
+ @Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
if (playable == null || item == null || !(playable instanceof L2PcInstance))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java
index 6cdcd4d420..b640a48ebc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java
@@ -30,6 +30,7 @@ public class BallistaBomb implements ISkillHandler
L2SkillType.BALLISTA
};
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -55,6 +56,7 @@ public class BallistaBomb implements ISkillHandler
/**
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BeastSkills.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BeastSkills.java
index 64d17f1a7a..261b886a9a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BeastSkills.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BeastSkills.java
@@ -39,6 +39,7 @@ public class BeastSkills implements ISkillHandler
L2SkillType.BEAST_ACCOMPANY
};
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -80,6 +81,7 @@ public class BeastSkills implements ISkillHandler
}
}
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Blow.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Blow.java
index 4ef485a3b4..97e6c30ea3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Blow.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Blow.java
@@ -48,6 +48,7 @@ public class Blow implements ISkillHandler
};
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (activeChar.isAlikeDead())
@@ -212,6 +213,7 @@ public class Blow implements ISkillHandler
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Charge.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Charge.java
index f06a17b7be..72a1fe76a0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Charge.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Charge.java
@@ -41,6 +41,7 @@ public class Charge implements ISkillHandler
private static final L2SkillType[] SKILL_IDS =
{/*L2SkillType.CHARGE*/};
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
@@ -64,6 +65,7 @@ public class Charge implements ISkillHandler
}
}
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
index f25e292d9e..bd329f5884 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
@@ -68,6 +68,7 @@ public class Continuous implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
boolean acted = true;
@@ -266,6 +267,7 @@ public class Continuous implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDam.java
index b8c2764f0a..3aeab9c7c1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDam.java
@@ -37,6 +37,7 @@ public class CpDam implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (activeChar.isAlikeDead())
@@ -121,6 +122,7 @@ public class CpDam implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDamPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDamPercent.java
index 4633d54b5f..9b88c98b93 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDamPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/CpDamPercent.java
@@ -37,6 +37,7 @@ public class CpDamPercent implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (activeChar.isAlikeDead())
@@ -121,6 +122,7 @@ public class CpDamPercent implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
index 5d0a33867b..aa14d81af7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Craft.java
@@ -41,6 +41,7 @@ public class Craft implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -60,6 +61,7 @@ public class Craft implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/DeluxeKey.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/DeluxeKey.java
index ca1b1af997..8143c766e3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/DeluxeKey.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/DeluxeKey.java
@@ -41,6 +41,7 @@ public class DeluxeKey implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -64,6 +65,7 @@ public class DeluxeKey implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java
index 057bab3039..a245f4e306 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java
@@ -34,6 +34,7 @@ public class Detection implements ISkillHandler
L2SkillType.DETECTION
};
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
final boolean hasParty;
@@ -71,6 +72,7 @@ public class Detection implements ISkillHandler
}
}
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
index 6dce452458..54ddad81b3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
@@ -614,7 +614,7 @@ public class Disablers implements ISkillHandler
*
* @param target
* @param type
- * @param power
+ * @param negateLvl
* @param maxRemoved
* @return
*/
@@ -627,7 +627,7 @@ public class Disablers implements ISkillHandler
*
* @param target
* @param type
- * @param power
+ * @param negateLvl
* @param skillId
* @param maxRemoved
* @return
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java
index 6df1db4d95..b19ac9e454 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Extractable.java
@@ -24,25 +24,21 @@ import com.l2jserver.gameserver.model.L2Skill;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.templates.skills.L2SkillType;
-import com.l2jserver.gameserver.util.Util;
import com.l2jserver.util.Rnd;
/**
- * @author Zoey76, based on previous version.
+ * @author Zoey76
*/
public class Extractable implements ISkillHandler
{
- //FIXME: Remove this once skill reuse will be global for main/subclass.
- private static final int[] protectedSkillIds = { 323, 324, 419, 519, 520, 620, 1324, 1387 };
-
private static final L2SkillType[] SKILL_TYPES =
{
L2SkillType.EXTRACTABLE,
L2SkillType.EXTRACTABLE_FISH
};
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -50,8 +46,7 @@ public class Extractable implements ISkillHandler
return;
}
- L2ExtractableSkill exItem = skill.getExtractableSkill();
-
+ final L2ExtractableSkill exItem = skill.getExtractableSkill();
if (exItem == null)
{
return;
@@ -101,71 +96,42 @@ public class Extractable implements ISkillHandler
chanceFrom += chance;
}
- L2PcInstance player = (L2PcInstance) activeChar;
-
- //FIXME: Remove this once skill reuse will be global for main/subclass.
- if (player.isSubClassActive() && (skill.getReuseDelay() > 0) && !Util.contains(protectedSkillIds, skill.getId()))
- {
- player.sendPacket(SystemMessageId.MAIN_CLASS_SKILL_ONLY);
- SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
- sm.addSkillName(skill);
- player.sendPacket(sm);
- return;
- }
-
+ final L2PcInstance player = activeChar.getActingPlayer();
if (createItemID[0] <= 0)
{
player.sendPacket(SystemMessageId.NOTHING_INSIDE_THAT);
return;
}
- else
+
+ for (int i = 0; i < createItemID.length; i++)
{
- for (int i = 0; i < createItemID.length; i++)
+ if (createItemID[i] <= 0)
{
- if (createItemID[i] <= 0)
- {
- continue;
- }
-
- if (ItemTable.getInstance().createDummyItem(createItemID[i]) == null)
- {
- _log.warning("Extractable Item Skill Id:" + skill.getId() + " createItemID " + createItemID[i] + " doesn't have a template!");
- player.sendPacket(SystemMessageId.NOTHING_INSIDE_THAT);
- return;
- }
-
- if (ItemTable.getInstance().createDummyItem(createItemID[i]).isStackable())
- {
- player.addItem("Extract", createItemID[i], createAmount[i], targets[0], false);
- }
- else
- {
- for (int j = 0; j < createAmount[i]; j++)
- {
- player.addItem("Extract", createItemID[i], 1, targets[0], false);
- }
- }
-
- if (createItemID[i] == 57)
- {
- SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_ADENA);;
- sm.addNumber(createAmount[i]);
- player.sendPacket(sm);
- }
- else
+ continue;
+ }
+
+ if (ItemTable.getInstance().createDummyItem(createItemID[i]) == null)
+ {
+ _log.warning("Extractable Item Skill Id:" + skill.getId() + " createItemID " + createItemID[i] + " doesn't have a template!");
+ player.sendPacket(SystemMessageId.NOTHING_INSIDE_THAT);
+ return;
+ }
+
+ if (ItemTable.getInstance().createDummyItem(createItemID[i]).isStackable())
+ {
+ player.addItem("Extract", createItemID[i], createAmount[i], targets[0], true);
+ }
+ else
+ {
+ for (int j = 0; j < createAmount[i]; j++)
{
- SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);;
- sm.addItemName(createItemID[i]);
- if (createAmount[i] > 1)
- {
- sm.addNumber(createAmount[i]);
- }
- player.sendPacket(sm);
+ player.addItem("Extract", createItemID[i], 1, targets[0], true);
}
}
}
}
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_TYPES;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Fishing.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Fishing.java
index 347744346d..596bb24c8b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Fishing.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Fishing.java
@@ -42,6 +42,7 @@ public class Fishing implements ISkillHandler
L2SkillType.FISHING
};
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -214,6 +215,7 @@ public class Fishing implements ISkillHandler
player.startFishing(x, y, z);
}
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java
index 07178bb19d..47df4c2a95 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java
@@ -38,6 +38,7 @@ public class FishingSkill implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -99,6 +100,7 @@ public class FishingSkill implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GetPlayer.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GetPlayer.java
index 9aae33aa6b..691129b6a4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GetPlayer.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GetPlayer.java
@@ -38,6 +38,7 @@ public class GetPlayer implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (activeChar.isAlikeDead())
@@ -60,6 +61,7 @@ public class GetPlayer implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java
index c3a2b63e2a..821b77ff69 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveReco.java
@@ -40,6 +40,7 @@ public class GiveReco implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
for (L2Object obj : targets)
@@ -73,6 +74,7 @@ public class GiveReco implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveSp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveSp.java
index 4b05689b0c..bd74aca950 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveSp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveSp.java
@@ -36,6 +36,7 @@ public class GiveSp implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
for (L2Object obj : targets)
@@ -53,6 +54,7 @@ public class GiveSp implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveVitality.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveVitality.java
index 21ff0bf552..e8835d3042 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveVitality.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/GiveVitality.java
@@ -31,6 +31,7 @@ public class GiveVitality implements ISkillHandler
L2SkillType.GIVE_VITALITY
};
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
for (L2Object target : targets)
@@ -51,6 +52,7 @@ public class GiveVitality implements ISkillHandler
}
}
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java
index cfd38db7f8..e28dff7095 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Harvest.java
@@ -48,6 +48,7 @@ public class Harvest implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -137,6 +138,8 @@ public class Harvest implements ISkillHandler
/**
*
+ * @param activeChar
+ * @param target
* @return
*/
private boolean calcSuccess(L2Character activeChar, L2Character target)
@@ -165,6 +168,7 @@ public class Harvest implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/InstantJump.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/InstantJump.java
index 085dca562d..2dfa3e3fd1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/InstantJump.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/InstantJump.java
@@ -45,6 +45,7 @@ public class InstantJump implements ISkillHandler
L2SkillType.INSTANT_JUMP
};
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
L2Character target = (L2Character) targets[0];
@@ -121,6 +122,7 @@ public class InstantJump implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ManaHeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ManaHeal.java
index 8fe887508d..1430f9f224 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ManaHeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ManaHeal.java
@@ -45,6 +45,7 @@ public class ManaHeal implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character actChar, L2Skill skill, L2Object[] targets)
{
for (L2Character target: (L2Character[]) targets)
@@ -146,6 +147,7 @@ public class ManaHeal implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java
index 3396b47964..b9525054f8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Manadam.java
@@ -44,6 +44,7 @@ public class Manadam implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (activeChar.isAlikeDead())
@@ -163,6 +164,7 @@ public class Manadam implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Mdam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Mdam.java
index 4b6de44e64..a3bada56e3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Mdam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Mdam.java
@@ -49,6 +49,7 @@ public class Mdam implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (activeChar.isAlikeDead())
@@ -215,6 +216,7 @@ public class Mdam implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java
index 6ea3cba113..6e5a5d749b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/NornilsPower.java
@@ -33,6 +33,7 @@ public class NornilsPower implements ISkillHandler
L2SkillType.NORNILS_POWER
};
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -67,6 +68,7 @@ public class NornilsPower implements ISkillHandler
activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
}
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java
index b165fedc39..c1f7432fa5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Pdam.java
@@ -51,6 +51,7 @@ public class Pdam implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (activeChar.isAlikeDead())
@@ -271,6 +272,7 @@ public class Pdam implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/RefuelAirShip.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/RefuelAirShip.java
index 52ba75accd..9457fed497 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/RefuelAirShip.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/RefuelAirShip.java
@@ -34,6 +34,7 @@ public class RefuelAirShip implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -53,6 +54,7 @@ public class RefuelAirShip implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
index 0a5cba63b8..277b63707a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
@@ -36,6 +36,7 @@ public class Resurrect implements ISkillHandler
L2SkillType.RESURRECT
};
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
L2PcInstance player = null;
@@ -83,6 +84,7 @@ public class Resurrect implements ISkillHandler
}
}
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ShiftTarget.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ShiftTarget.java
index f68b1e3b8d..373cd7ce32 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ShiftTarget.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/ShiftTarget.java
@@ -32,6 +32,7 @@ public class ShiftTarget implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (targets == null)
@@ -57,6 +58,7 @@ public class ShiftTarget implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Soul.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Soul.java
index 22cca7af1f..d6ff73edf5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Soul.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Soul.java
@@ -40,6 +40,7 @@ public class Soul implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance) || activeChar.isAlikeDead())
@@ -79,6 +80,7 @@ public class Soul implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java
index 6bf8552320..dbf0328ca0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sow.java
@@ -49,6 +49,7 @@ public class Sow implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -145,6 +146,7 @@ public class Sow implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java
index ab31aaf80a..c66a2ffcc6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Spoil.java
@@ -36,6 +36,7 @@ public class Spoil implements ISkillHandler
L2SkillType.SPOIL
};
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -81,6 +82,7 @@ public class Spoil implements ISkillHandler
}
}
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java
index f31de94cc8..2d68ecfefd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StealBuffs.java
@@ -43,6 +43,7 @@ public class StealBuffs implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
// discharge shots
@@ -206,6 +207,7 @@ public class StealBuffs implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StrSiegeAssault.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StrSiegeAssault.java
index b14ba23d91..cbb42aeff8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StrSiegeAssault.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/StrSiegeAssault.java
@@ -43,6 +43,7 @@ public class StrSiegeAssault implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
@@ -121,6 +122,7 @@ public class StrSiegeAssault implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/SummonFriend.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/SummonFriend.java
index e37082e514..16642ac9db 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/SummonFriend.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/SummonFriend.java
@@ -35,6 +35,7 @@ public class SummonFriend implements ISkillHandler
{
private static final L2SkillType[] SKILL_IDS = { L2SkillType.SUMMON_FRIEND };
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -120,6 +121,7 @@ public class SummonFriend implements ISkillHandler
}
}
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sweep.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sweep.java
index 7e7d59cb12..ddd67f9da6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sweep.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Sweep.java
@@ -35,6 +35,7 @@ public class Sweep implements ISkillHandler
private static final L2SkillType[] SKILL_IDS = { L2SkillType.SWEEP };
private static final int maxSweepTime = 15000;
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -124,6 +125,7 @@ public class Sweep implements ISkillHandler
}
}
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java
index e003c52f36..260522e27a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeCastle.java
@@ -38,6 +38,7 @@ public class TakeCastle implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -66,6 +67,7 @@ public class TakeCastle implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java
index d749d1dfde..d4683aed2e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java
@@ -38,6 +38,7 @@ public class TakeFort implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (!(activeChar instanceof L2PcInstance))
@@ -65,6 +66,7 @@ public class TakeFort implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java
index 6fe0a1b233..5ebeae95e9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/TransformDispel.java
@@ -36,6 +36,7 @@ public class TransformDispel implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (activeChar.isAlikeDead())
@@ -62,6 +63,7 @@ public class TransformDispel implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java
index f4e4c3f97d..65aed11345 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Trap.java
@@ -37,6 +37,7 @@ public class Trap implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
*/
+ @Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
if (activeChar == null || skill == null)
@@ -99,6 +100,7 @@ public class Trap implements ISkillHandler
*
* @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
*/
+ @Override
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
index fb89705831..2e45048c6e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Unlock.java
@@ -101,31 +101,27 @@ public class Unlock implements ISkillHandler
else if (target instanceof L2ChestInstance)
{
L2ChestInstance chest = (L2ChestInstance) target;
- if (chest.getCurrentHp() <= 0
- || chest.isInteracted()
- || activeChar.getInstanceId() != chest.getInstanceId())
+ if ((chest.getCurrentHp() <= 0) || chest.isInteracted() || activeChar.getInstanceId() != chest.getInstanceId())
{
activeChar.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
+
+ chest.setInteracted();
+ if (chestUnlock(skill, chest))
+ {
+ activeChar.broadcastSocialAction(3);
+ chest.setSpecialDrop();
+ chest.setMustRewardExpSp(false);
+ chest.reduceCurrentHp(99999999, activeChar, skill);
+ }
else
{
- chest.setInteracted();
- if (chestUnlock(skill, chest))
- {
- activeChar.broadcastSocialAction(3);
- chest.setSpecialDrop();
- chest.setMustRewardExpSp(false);
- chest.reduceCurrentHp(99999999, activeChar, skill);
- }
- else
- {
- activeChar.broadcastSocialAction(13);
- chest.addDamageHate(activeChar, 0, 1);
- chest.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, activeChar);
- if (chestTrap(chest))
- chest.chestTrap(activeChar);
- }
+ activeChar.broadcastSocialAction(13);
+ chest.addDamageHate(activeChar, 0, 1);
+ chest.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, activeChar);
+ if (chestTrap(chest))
+ chest.chestTrap(activeChar);
}
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
index 7e7eba49ee..e80da167d7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
@@ -109,8 +109,7 @@ public class TargetCorpsePlayer implements ITargetTypeHandler
targetList.add(target);
return targetList.toArray(new L2Object[targetList.size()]);
}
- else
- return new L2Character[] { target };
+ return new L2Character[] { target };
}
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
index 2443796533..26d769768d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
@@ -51,14 +51,10 @@ public class TargetPartyMember implements ITargetTypeHandler
// If a target is found, return it in a table else send a system message TARGET_IS_INCORRECT
return new L2Character[] { target };
}
- else
- return _emptyTargetList;
- }
- else
- {
- activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return _emptyTargetList;
}
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+ return _emptyTargetList;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
index ba29b857d5..6740e1497d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
@@ -43,26 +43,24 @@ public class TargetPartyOther implements ITargetTypeHandler
// FORCE BUFFS may cancel here but there should be a proper condition
case 426:
if (!((L2PcInstance) target).isMageClass())
+ {
return new L2Character[] { target };
- else
- return _emptyTargetList;
+ }
+ return _emptyTargetList;
case 427:
if (((L2PcInstance) target).isMageClass())
+ {
return new L2Character[] { target };
- else
- return _emptyTargetList;
+ }
+ return _emptyTargetList;
}
}
return new L2Character[] { target };
}
- else
- return _emptyTargetList;
- }
- else
- {
- activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return _emptyTargetList;
}
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+ return _emptyTargetList;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
index 0083ebcaca..cacfad1c0b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
@@ -45,8 +45,7 @@ public class TargetUnlockable implements ITargetTypeHandler
targetList.add(target);
return targetList.toArray(new L2Object[targetList.size()]);
}
- else
- return new L2Character[] { target };
+ return new L2Character[] { target };
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
index 2c6e651d1e..2d2a1327c1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
@@ -303,10 +303,7 @@ public class DebugHandler implements ITelnetHandler
{
return mbean.findDeadlockedThreads();
}
- else
- {
- return mbean.findMonitorDeadlockedThreads();
- }
+ return mbean.findMonitorDeadlockedThreads();
}
private Thread findMatchingThread(ThreadInfo inf)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Birthday.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Birthday.java
index 7d976f65d4..efc2f689fb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Birthday.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Birthday.java
@@ -22,9 +22,8 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
- * @author JIV
* Support for /mybirthday command
- *
+ * @author JIV
*/
public class Birthday implements IUserCommandHandler
{
@@ -33,6 +32,7 @@ public class Birthday implements IUserCommandHandler
126
};
+ @Override
public boolean useUserCommand(int id, L2PcInstance activeChar)
{
if (id != COMMAND_IDS[0])
@@ -50,6 +50,7 @@ public class Birthday implements IUserCommandHandler
return true;
}
+ @Override
public int[] getUserCommandList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java
index 885b3d4cea..6908dde850 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelDelete.java
@@ -35,6 +35,7 @@ public class ChannelDelete implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useUserCommand(int id, L2PcInstance activeChar)
{
if (id != COMMAND_IDS[0])
@@ -61,6 +62,7 @@ public class ChannelDelete implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
*/
+ @Override
public int[] getUserCommandList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java
index ede6462b6e..c2a1aca430 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelLeave.java
@@ -36,6 +36,7 @@ public class ChannelLeave implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useUserCommand(int id, L2PcInstance activeChar)
{
if (id != COMMAND_IDS[0])
@@ -66,6 +67,7 @@ public class ChannelLeave implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
*/
+ @Override
public int[] getUserCommandList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelListUpdate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelListUpdate.java
index 3d4b8ac397..344f068fba 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelListUpdate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ChannelListUpdate.java
@@ -34,6 +34,7 @@ public class ChannelListUpdate implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useUserCommand(int id, L2PcInstance activeChar)
{
if (id != COMMAND_IDS[0])
@@ -52,6 +53,7 @@ public class ChannelListUpdate implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
*/
+ @Override
public int[] getUserCommandList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java
index 4212f92c82..115298db0b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java
@@ -38,6 +38,7 @@ public class ClanPenalty implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useUserCommand(int id, L2PcInstance activeChar)
{
if (id != COMMAND_IDS[0])
@@ -104,6 +105,7 @@ public class ClanPenalty implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
*/
+ @Override
public int[] getUserCommandList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java
index d42b2ed5c2..bd8a9b7b59 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java
@@ -43,6 +43,7 @@ public class ClanWarsList implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useUserCommand(int id, L2PcInstance activeChar)
{
if (id != COMMAND_IDS[0] && id != COMMAND_IDS[1] && id != COMMAND_IDS[2])
@@ -135,6 +136,7 @@ public class ClanWarsList implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
*/
+ @Override
public int[] getUserCommandList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/DisMount.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/DisMount.java
index ca0ca485b5..6d272256df 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/DisMount.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/DisMount.java
@@ -32,6 +32,7 @@ public class DisMount implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public synchronized boolean useUserCommand(int id, L2PcInstance activeChar)
{
if (id != COMMAND_IDS[0])
@@ -49,6 +50,7 @@ public class DisMount implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
*/
+ @Override
public int[] getUserCommandList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Escape.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Escape.java
index 51772da2c9..7f4ca82dc6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Escape.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Escape.java
@@ -48,6 +48,7 @@ public class Escape implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useUserCommand(int id, L2PcInstance activeChar)
{
// Thanks nbd
@@ -138,6 +139,7 @@ public class Escape implements IUserCommandHandler
_activeChar = activeChar;
}
+ @Override
public void run()
{
if (_activeChar.isDead())
@@ -163,6 +165,7 @@ public class Escape implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
*/
+ @Override
public int[] getUserCommandList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java
index 50c6e19623..f68901fab7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java
@@ -36,6 +36,7 @@ public class InstanceZone implements IUserCommandHandler
/**
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
*/
+ @Override
public int[] getUserCommandList()
{
return COMMAND_IDS;
@@ -44,6 +45,7 @@ public class InstanceZone implements IUserCommandHandler
/**
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useUserCommand(int id, L2PcInstance activeChar)
{
if (id != COMMAND_IDS[0])
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java
index a9a0a6c95b..9bd92b2320 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java
@@ -33,6 +33,7 @@ public class Loc implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useUserCommand(int id, L2PcInstance activeChar)
{
int region;
@@ -58,6 +59,7 @@ public class Loc implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
*/
+ @Override
public int[] getUserCommandList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Mount.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Mount.java
index 6049740810..6bd150d5de 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Mount.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Mount.java
@@ -33,6 +33,7 @@ public class Mount implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public synchronized boolean useUserCommand(int id, L2PcInstance activeChar)
{
if (id != COMMAND_IDS[0])
@@ -45,6 +46,7 @@ public class Mount implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
*/
+ @Override
public int[] getUserCommandList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java
index 859f0cbec1..4c106346ef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java
@@ -32,6 +32,7 @@ public class OlympiadStat implements IUserCommandHandler
/**
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useUserCommand(int id, L2PcInstance activeChar)
{
if (id != COMMAND_IDS[0])
@@ -78,6 +79,7 @@ public class OlympiadStat implements IUserCommandHandler
/**
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
*/
+ @Override
public int[] getUserCommandList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java
index e01fa83abb..2134810aae 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java
@@ -35,6 +35,7 @@ public class PartyInfo implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useUserCommand(int id, L2PcInstance activeChar)
{
if (id != COMMAND_IDS[0])
@@ -87,6 +88,7 @@ public class PartyInfo implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
*/
+ @Override
public int[] getUserCommandList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Time.java
index c045e335db..b94235ec78 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Time.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Time.java
@@ -36,6 +36,7 @@ public class Time implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
*/
+ @Override
public boolean useUserCommand(int id, L2PcInstance activeChar)
{
if (COMMAND_IDS[0] != id)
@@ -72,6 +73,7 @@ public class Time implements IUserCommandHandler
*
* @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
*/
+ @Override
public int[] getUserCommandList()
{
return COMMAND_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Banking.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Banking.java
index 265e5e00e3..5f069b113f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Banking.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Banking.java
@@ -36,6 +36,7 @@ public class Banking implements IVoicedCommandHandler
*
* @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
*/
+ @Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
if (command.equalsIgnoreCase("bank"))
@@ -79,6 +80,7 @@ public class Banking implements IVoicedCommandHandler
*
* @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
*/
+ @Override
public String[] getVoicedCommandList()
{
return _voicedCommands;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java
index f352320f3d..9fa3a1d5ec 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java
@@ -36,6 +36,7 @@ public class ChangePassword implements IVoicedCommandHandler
"changepassword"
};
+ @Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String target)
{
if (target != null)
@@ -92,6 +93,7 @@ public class ChangePassword implements IVoicedCommandHandler
return true;
}
+ @Override
public String[] getVoicedCommandList()
{
return _voicedCommands;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java
index 036787b38e..b7007f606d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java
@@ -34,6 +34,7 @@ public class ChatAdmin implements IVoicedCommandHandler
*
* @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
*/
+ @Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
if (!AdminCommandAccessRights.getInstance().hasAccess(command, activeChar.getAccessLevel()))
@@ -157,6 +158,7 @@ public class ChatAdmin implements IVoicedCommandHandler
*
* @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
*/
+ @Override
public String[] getVoicedCommandList()
{
return VOICED_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java
index becc6ccdd7..6765434498 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java
@@ -29,6 +29,7 @@ public class Debug implements IVoicedCommandHandler
*
* @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
*/
+ @Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
if (!AdminCommandAccessRights.getInstance().hasAccess(command, activeChar.getAccessLevel()))
@@ -54,6 +55,7 @@ public class Debug implements IVoicedCommandHandler
*
* @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
*/
+ @Override
public String[] getVoicedCommandList()
{
return VOICED_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
index 5f33930901..fadb4bd086 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
@@ -33,6 +33,7 @@ public class Lang implements IVoicedCommandHandler
*
* @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
*/
+ @Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
if (!Config.L2JMOD_MULTILANG_ENABLE
@@ -71,11 +72,8 @@ public class Lang implements IVoicedCommandHandler
activeChar.sendPacket(msg);
return true;
}
- else
- {
- msg.setFile(activeChar.getHtmlPrefix(), "data/html/mods/Lang/Error.htm");
- activeChar.sendPacket(msg);
- }
+ msg.setFile(activeChar.getHtmlPrefix(), "data/html/mods/Lang/Error.htm");
+ activeChar.sendPacket(msg);
}
return false;
@@ -85,6 +83,7 @@ public class Lang implements IVoicedCommandHandler
*
* @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
*/
+ @Override
public String[] getVoicedCommandList()
{
return VOICED_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java
index 1f45873905..5234fa464a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java
@@ -39,6 +39,7 @@ public class TvTVoicedInfo implements IVoicedCommandHandler
private static final boolean USE_STATIC_HTML = true;
private static final String HTML = HtmCache.getInstance().getHtm(null, "data/html/mods/TvTEvent/Status.htm");
+ @Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String target)
{
if (command.equalsIgnoreCase("tvt"))
@@ -77,6 +78,7 @@ public class TvTVoicedInfo implements IVoicedCommandHandler
return true;
}
+ @Override
public String[] getVoicedCommandList()
{
return _voicedCommands;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
index a57bc8d694..b4aff32a80 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
@@ -62,6 +62,7 @@ public class Wedding implements IVoicedCommandHandler
/**
* @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
*/
+ @Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
if (activeChar == null)
@@ -444,6 +445,7 @@ public class Wedding implements IVoicedCommandHandler
_to7sDungeon = to7sDungeon;
}
+ @Override
public void run()
{
if (_activeChar.isDead())
@@ -473,6 +475,7 @@ public class Wedding implements IVoicedCommandHandler
/**
* @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
*/
+ @Override
public String[] getVoicedCommandList()
{
return _voicedCommands;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/castle.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/castle.java
index a83905cb10..b1538c7f88 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/castle.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/castle.java
@@ -37,6 +37,7 @@ public class castle implements IVoicedCommandHandler
*
* @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
*/
+ @Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
if (command.startsWith("open doors") && params.equals("castle") && (activeChar.isClanLeader()))
@@ -77,6 +78,7 @@ public class castle implements IVoicedCommandHandler
*
* @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
*/
+ @Override
public String[] getVoicedCommandList()
{
return VOICED_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/set.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/set.java
index e6152fc14b..5dcc67f823 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/set.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/set.java
@@ -34,6 +34,7 @@ public class set implements IVoicedCommandHandler
*
* @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
*/
+ @Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
if (command.startsWith("set privileges"))
@@ -59,6 +60,7 @@ public class set implements IVoicedCommandHandler
*
* @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
*/
+ @Override
public String[] getVoicedCommandList()
{
return VOICED_COMMANDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java
index ee9fcf84ec..4f04ed4e9c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/BaseTower/BaseTower.java
@@ -57,10 +57,7 @@ public class BaseTower extends Quest
{
return "32301-02.htm";
}
- else
- {
- return "32301-01.htm";
- }
+ return "32301-01.htm";
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java
index 2333259ea1..d688f77ddc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java
@@ -125,7 +125,7 @@ public class Engine extends Quest implements Runnable
}
}
- if (_cachedLevel >= 0)
+ if (_cachedLevel > 0)
{
Announcements.getInstance().announceToAll(ANNOUNCE.replace("%lvl%", String.valueOf(newLevel)));
_log.info("HellboundEngine: New Level: " + newLevel);
@@ -222,7 +222,7 @@ public class Engine extends Quest implements Runnable
public void run()
{
int level = HellboundManager.getInstance().getLevel();
- if (level == _cachedLevel)
+ if ((level > 0) && (level == _cachedLevel))
{
if ((HellboundManager.getInstance().getTrust() == HellboundManager.getInstance().getMaxTrust()) && (level != 4)) // only exclusion is kill of Derek
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Quarry/Quarry.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Quarry/Quarry.java
index d52baea7cc..80c6ae253a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Quarry/Quarry.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Quarry/Quarry.java
@@ -120,14 +120,12 @@ public class Quarry extends Quest
{
return "32299.htm";
}
- else
+
+ if (player.getQuestState(getName()) == null)
{
- if (player.getQuestState(getName()) == null)
- {
- newQuestState(player);
- }
- return "32299-01.htm";
+ newQuestState(player);
}
+ return "32299-01.htm";
}
// Let's manage kill points in Engine
@@ -141,9 +139,9 @@ public class Quarry extends Quest
@Override
public final String onEnterZone(L2Character character, L2ZoneType zone)
{
- if (character instanceof L2Npc)
+ if (character instanceof L2Attackable)
{
- final L2Npc npc = (L2Npc) character;
+ final L2Attackable npc = (L2Attackable) character;
if (npc.getNpcId() == SLAVE)
{
if (!npc.isDead() && !npc.isDecayed() && (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_FOLLOW))
@@ -186,7 +184,7 @@ public class Quarry extends Quest
{
if (Rnd.get(10000) < i[1])
{
- ((L2Attackable) _npc).dropItem((L2PcInstance) (_npc.getTarget()), i[0], (int) Config.RATE_DROP_ITEMS);
+ ((L2Attackable) _npc).dropItem((L2PcInstance) _npc.getTarget(), i[0], (int) Config.RATE_DROP_ITEMS);
break;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
index a28046ba92..f6f222e3d9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TowerOfNaia/TowerOfNaia.java
@@ -515,10 +515,7 @@ public class TowerOfNaia extends Quest
{
return "18492-02.htm";
}
- else
- {
- return "18492-01.htm";
- }
+ return "18492-01.htm";
}
else if ((npcId >= ROOM_MANAGER_FIRST) && (npcId <= ROOM_MANAGER_LAST))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
index 2324043674..25a38dacee 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
@@ -1177,9 +1177,9 @@ public class TullyWorkshop extends Quest
L2MonsterInstance victim2 = spawnedFollowers.get(0); // KIRETCENAH
L2MonsterInstance actor = spawnedFollowers.get(2); // DRAXIUS
- double transferringHp = actor.getMaxHp() * 0.0001;
if ((actor != null) && !actor.isDead())
{
+ double transferringHp = actor.getMaxHp() * 0.0001;
if ((Rnd.get(10000) > 1500) && (victim1 != null) && !victim1.isDead())
{
if ((actor.getCurrentHp() - transferringHp) > 1)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
index dc79ef90de..2361ab99a2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
@@ -543,41 +543,39 @@ public class CrystalCaverns extends Quest
teleportplayer(player, teleto);
return world.instanceId;
}
+
// New instance
+ if (!checkConditions(player))
+ return 0;
+ L2Party party = player.getParty();
+ int instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+ world = new CCWorld(System.currentTimeMillis() + 5400000);
+ world.instanceId = instanceId;
+ world.templateId = INSTANCEID;
+ InstanceManager.getInstance().addWorld(world);
+ _log.info("Crystal Caverns started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+ runOracle((CCWorld) world);
+ // teleport players
+ teleto.instanceId = instanceId;
+ if (player.getParty() == null)
+ {
+ // this can happen only if debug is true
+ player.sendMessage("Welcome to Crystal Caverns.");
+ InstanceManager.getInstance().setInstanceTime(player.getObjectId(), INSTANCEID, ((System.currentTimeMillis() + INSTANCEPENALTY)));
+ teleportplayer(player, teleto);
+ world.allowed.add(player.getObjectId());
+ }
else
{
- if (!checkConditions(player))
- return 0;
- L2Party party = player.getParty();
- int instanceId = InstanceManager.getInstance().createDynamicInstance(template);
- world = new CCWorld(System.currentTimeMillis() + 5400000);
- world.instanceId = instanceId;
- world.templateId = INSTANCEID;
- InstanceManager.getInstance().addWorld(world);
- _log.info("Crystal Caverns started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
- runOracle((CCWorld) world);
- // teleport players
- teleto.instanceId = instanceId;
- if (player.getParty() == null)
- {
- // this can happen only if debug is true
- player.sendMessage("Welcome to Crystal Caverns.");
- InstanceManager.getInstance().setInstanceTime(player.getObjectId(), INSTANCEID, ((System.currentTimeMillis() + INSTANCEPENALTY)));
- teleportplayer(player, teleto);
- world.allowed.add(player.getObjectId());
- }
- else
+ for (L2PcInstance partyMember : party.getPartyMembers())
{
- for (L2PcInstance partyMember : party.getPartyMembers())
- {
- partyMember.sendMessage("Welcome to Crystal Caverns.");
- InstanceManager.getInstance().setInstanceTime(partyMember.getObjectId(), INSTANCEID, ((System.currentTimeMillis() + INSTANCEPENALTY)));
- teleportplayer(partyMember, teleto);
- world.allowed.add(partyMember.getObjectId());
- }
+ partyMember.sendMessage("Welcome to Crystal Caverns.");
+ InstanceManager.getInstance().setInstanceTime(partyMember.getObjectId(), INSTANCEID, ((System.currentTimeMillis() + INSTANCEPENALTY)));
+ teleportplayer(partyMember, teleto);
+ world.allowed.add(partyMember.getObjectId());
}
- return instanceId;
}
+ return instanceId;
}
protected void exitInstance(L2PcInstance player, teleCoord tele)
@@ -1783,20 +1781,19 @@ public class CrystalCaverns extends Quest
if (door.getDoorId() == (room + 24220000))
{
if (door.getOpen())
- return "";
- else
{
- QuestState st = ((L2PcInstance) character).getQuestState(qn);
- if (st == null)
- st = newQuestState((L2PcInstance) character);
- if (!st.hasQuestItems(RACE_KEY))
- return "";
- if (world.roomsStatus[zone.getId() - 20104] == 0)
- runEmeraldRooms(world, spawns, room);
- door.openMe();
- st.takeItems(RACE_KEY, 1);
- world.openedDoors.put(door, (L2PcInstance) character);
+ return "";
}
+ QuestState st = ((L2PcInstance) character).getQuestState(qn);
+ if (st == null)
+ st = newQuestState((L2PcInstance) character);
+ if (!st.hasQuestItems(RACE_KEY))
+ return "";
+ if (world.roomsStatus[zone.getId() - 20104] == 0)
+ runEmeraldRooms(world, spawns, room);
+ door.openMe();
+ st.takeItems(RACE_KEY, 1);
+ world.openedDoors.put(door, (L2PcInstance) character);
break;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 57372c56ef..14284d21b7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -225,45 +225,45 @@ public class DarkCloudMansion extends Quest
private boolean checkConditions(L2PcInstance player)
{
if (debug)
+ {
return true;
- else
+ }
+
+ L2Party party = player.getParty();
+ if (party == null)
{
- L2Party party = player.getParty();
- if (party == null)
- {
- player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
- return false;
- }
- if (party.getLeader() != player)
+ player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
+ return false;
+ }
+ if (party.getLeader() != player)
+ {
+ player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
+ return false;
+ }
+ if (party.getMemberCount() > 2)
+ {
+ player.sendPacket(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER);
+ return false;
+ }
+ for (L2PcInstance partyMember : party.getPartyMembers())
+ {
+ if (partyMember.getLevel() < 78)
{
- player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
+ SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_LEVEL_REQUIREMENT_NOT_SUFFICIENT);
+ sm.addPcName(partyMember);
+ player.sendPacket(sm);
return false;
}
- if (party.getMemberCount() > 2)
+ if (!partyMember.isInsideRadius(player, 1000, true, true))
{
- player.sendPacket(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER);
+ SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_LOCATION_THAT_CANNOT_BE_ENTERED);
+ sm.addPcName(partyMember);
+ player.sendPacket(sm);
return false;
}
- for (L2PcInstance partyMember : party.getPartyMembers())
- {
- if (partyMember.getLevel() < 78)
- {
- SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_LEVEL_REQUIREMENT_NOT_SUFFICIENT);
- sm.addPcName(partyMember);
- player.sendPacket(sm);
- return false;
- }
- if (!partyMember.isInsideRadius(player, 1000, true, true))
- {
- SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_LOCATION_THAT_CANNOT_BE_ENTERED);
- sm.addPcName(partyMember);
- player.sendPacket(sm);
- return false;
- }
- }
-
- return true;
}
+
+ return true;
}
private void teleportplayer(L2PcInstance player, teleCoord teleto)
@@ -292,38 +292,35 @@ public class DarkCloudMansion extends Quest
return instanceId;
}
//New instance
+ if (!checkConditions(player))
+ return 0;
+ L2Party party = player.getParty();
+ instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+ world = new DMCWorld();
+ world.instanceId = instanceId;
+ world.templateId = INSTANCEID;
+ InstanceManager.getInstance().addWorld(world);
+ _log.info("DarkCloudMansion: started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+ runStartRoom((DMCWorld)world);
+ // teleport players
+ teleto.instanceId = instanceId;
+ if (debug && party == null)
+ {
+ world.allowed.add(player.getObjectId());
+ teleportplayer(player,teleto);
+ }
else
{
- if (!checkConditions(player))
- return 0;
- L2Party party = player.getParty();
- instanceId = InstanceManager.getInstance().createDynamicInstance(template);
- world = new DMCWorld();
- world.instanceId = instanceId;
- world.templateId = INSTANCEID;
- InstanceManager.getInstance().addWorld(world);
- _log.info("DarkCloudMansion: started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
- runStartRoom((DMCWorld)world);
- // teleport players
- teleto.instanceId = instanceId;
- if (debug && party == null)
- {
- world.allowed.add(player.getObjectId());
- teleportplayer(player,teleto);
- }
- else
+ for (L2PcInstance partyMember : party.getPartyMembers())
{
- for (L2PcInstance partyMember : party.getPartyMembers())
- {
- if (partyMember.getQuestState(qn) == null)
- newQuestState(partyMember);
- world.allowed.add(partyMember.getObjectId());
- teleportplayer(partyMember,teleto);
- }
+ if (partyMember.getQuestState(qn) == null)
+ newQuestState(partyMember);
+ world.allowed.add(partyMember.getObjectId());
+ teleportplayer(partyMember,teleto);
}
-
- return instanceId;
}
+
+ return instanceId;
}
protected void exitInstance(L2PcInstance player, teleCoord tele)
@@ -817,9 +814,10 @@ public class DarkCloudMansion extends Quest
for (DMCNpc mob : SecondRoom.npcList)
{
if (mob.isDead)
+ {
continue;
- else
- return false;
+ }
+ return false;
}
return true;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DemonPrinceFloor/DemonPrinceFloor.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DemonPrinceFloor/DemonPrinceFloor.java
index a05a168033..2737c194b1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/DemonPrinceFloor/DemonPrinceFloor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/DemonPrinceFloor/DemonPrinceFloor.java
@@ -219,29 +219,27 @@ public class DemonPrinceFloor extends Quest
teleportPlayer(player, ENTRY_POINT, world.instanceId);
return world.instanceId;
}
- else
+
+ if (!checkTeleport(player))
{
- if (!checkTeleport(player))
- {
- return 0;
- }
-
- instanceId = InstanceManager.getInstance().createDynamicInstance(template);
- world = new DPWorld();
- world.instanceId = instanceId;
- world.templateId = INSTANCEID;
- world.status = 0;
- InstanceManager.getInstance().addWorld(world);
- _log.info("Tower of Infinitum - Demon Prince floor started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-
- for (L2PcInstance partyMember : player.getParty().getPartyMembers())
- {
- teleportPlayer(partyMember, ENTRY_POINT, instanceId);
- partyMember.destroyItemByItemId("Quest", SEAL_BREAKER_5, 1, null, true);
- world.allowed.add(partyMember.getObjectId());
- }
- return instanceId;
+ return 0;
+ }
+
+ instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+ world = new DPWorld();
+ world.instanceId = instanceId;
+ world.templateId = INSTANCEID;
+ world.status = 0;
+ InstanceManager.getInstance().addWorld(world);
+ _log.info("Tower of Infinitum - Demon Prince floor started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+
+ for (L2PcInstance partyMember : player.getParty().getPartyMembers())
+ {
+ teleportPlayer(partyMember, ENTRY_POINT, instanceId);
+ partyMember.destroyItemByItemId("Quest", SEAL_BREAKER_5, 1, null, true);
+ world.allowed.add(partyMember.getObjectId());
}
+ return instanceId;
}
public void setReenterTime(InstanceWorld world)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
index 886e45743f..45ed26fb8a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
@@ -496,38 +496,36 @@ public class FinalEmperialTomb extends Quest
teleportPlayer(player, coords, world.instanceId);
return world.instanceId;
}
+
//New instance
+ if (!checkConditions(player))
+ return 0;
+ if (!player.isGM() && !player.destroyItemByItemId("QUEST", 8073, 1, player, true))
+ return 0;
+ instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+ //Instance ins = InstanceManager.getInstance().getInstance(instanceId);
+ //ins.setSpawnLoc(new int[]{player.getX(),player.getY(),player.getZ()});
+ world = new FETWorld();
+ world.instanceId = instanceId;
+ world.status = 0;
+ InstanceManager.getInstance().addWorld(world);
+ controlStatus((FETWorld) world);
+ _log.info("Final Emperial Tomb started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+ // teleport players
+ if (player.getParty() == null || player.getParty().getCommandChannel() == null)
+ {
+ world.allowed.add(player.getObjectId());
+ teleportPlayer(player, coords, instanceId);
+ }
else
{
- if (!checkConditions(player))
- return 0;
- if (!player.isGM() && !player.destroyItemByItemId("QUEST", 8073, 1, player, true))
- return 0;
- instanceId = InstanceManager.getInstance().createDynamicInstance(template);
- //Instance ins = InstanceManager.getInstance().getInstance(instanceId);
- //ins.setSpawnLoc(new int[]{player.getX(),player.getY(),player.getZ()});
- world = new FETWorld();
- world.instanceId = instanceId;
- world.status = 0;
- InstanceManager.getInstance().addWorld(world);
- controlStatus((FETWorld) world);
- _log.info("Final Emperial Tomb started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
- // teleport players
- if (player.getParty() == null || player.getParty().getCommandChannel() == null)
+ for (L2PcInstance channelMember : player.getParty().getCommandChannel().getMembers())
{
- world.allowed.add(player.getObjectId());
- teleportPlayer(player, coords, instanceId);
- }
- else
- {
- for (L2PcInstance channelMember : player.getParty().getCommandChannel().getMembers())
- {
- world.allowed.add(channelMember.getObjectId());
- teleportPlayer(channelMember, coords, instanceId);
- }
+ world.allowed.add(channelMember.getObjectId());
+ teleportPlayer(channelMember, coords, instanceId);
}
- return instanceId;
}
+ return instanceId;
}
protected synchronized boolean checkKillProgress(L2Npc mob, FETWorld world)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java
index 5c463855ad..7871d9f9ab 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/HellboundTown/HellboundTown.java
@@ -141,10 +141,7 @@ public class HellboundTown extends Quest
{
return "32358-02.htm";
}
- else
- {
- return "32358-01.htm";
- }
+ return "32358-01.htm";
}
@Override
@@ -444,36 +441,31 @@ public class HellboundTown extends Quest
player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
return 0;
}
- else
- {
- teleportPlayer(player, ENTRY_POINT, world.instanceId);
- return world.instanceId;
- }
+ teleportPlayer(player, ENTRY_POINT, world.instanceId);
+ return world.instanceId;
}
- else
+
+ if (!checkTeleport(player))
{
- if (!checkTeleport(player))
- {
- return 0;
- }
-
- instanceId = InstanceManager.getInstance().createDynamicInstance(template);
- world = new TownWorld();
- world.instanceId = instanceId;
- world.templateId = INSTANCEID;
- world.status = 0;
- InstanceManager.getInstance().addWorld(world);
- _log.info("Hellbound Town started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-
- for (L2PcInstance partyMember : player.getParty().getPartyMembers())
- {
- teleportPlayer(partyMember, ENTRY_POINT, instanceId);
- world.allowed.add(partyMember.getObjectId());
- }
-
- ((TownWorld) world).spawnedAmaskari = (L2MonsterInstance) addSpawn(AMASKARI, AMASKARI_SPAWN_POINT[0], AMASKARI_SPAWN_POINT[1], AMASKARI_SPAWN_POINT[2], AMASKARI_SPAWN_POINT[3], false, 0, false, instanceId);
- return instanceId;
+ return 0;
}
+
+ instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+ world = new TownWorld();
+ world.instanceId = instanceId;
+ world.templateId = INSTANCEID;
+ world.status = 0;
+ InstanceManager.getInstance().addWorld(world);
+ _log.info("Hellbound Town started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+
+ for (L2PcInstance partyMember : player.getParty().getPartyMembers())
+ {
+ teleportPlayer(partyMember, ENTRY_POINT, instanceId);
+ world.allowed.add(partyMember.getObjectId());
+ }
+
+ ((TownWorld) world).spawnedAmaskari = (L2MonsterInstance) addSpawn(AMASKARI, AMASKARI_SPAWN_POINT[0], AMASKARI_SPAWN_POINT[1], AMASKARI_SPAWN_POINT[2], AMASKARI_SPAWN_POINT[3], false, 0, false, instanceId);
+ return instanceId;
}
private static class CallAmaskari implements Runnable
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 015635918c..bd6657bfa9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -600,49 +600,46 @@ public class Kamaloka extends Quest
return;
}
// Creating new kamaloka instance
- else
+ if (!checkConditions(player, index))
+ return;
+
+ // Creating dynamic instance without template
+ final int instanceId = InstanceManager.getInstance().createDynamicInstance(null);
+ final Instance inst = InstanceManager.getInstance().getInstance(instanceId);
+ // set name for the kamaloka
+ inst.setName(InstanceManager.getInstance().getInstanceIdName(templateId));
+ // set return location
+ final int[] returnLoc = { player.getX(), player.getY(), player.getZ() };
+ inst.setSpawnLoc(returnLoc);
+ // disable summon friend into instance
+ inst.setAllowSummon(false);
+ // set duration and empty destroy time
+ inst.setDuration(DURATION[index] * 60000);
+ inst.setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000);
+
+ // Creating new instanceWorld, using our instanceId and templateId
+ world = new KamaWorld();
+ world.instanceId = instanceId;
+ world.templateId = templateId;
+ // set index for easy access to the arrays
+ ((KamaWorld)world).index = index;
+ InstanceManager.getInstance().addWorld(world);
+ world.status = 0;
+ // spawn npcs
+ spawnKama((KamaWorld)world);
+
+ // and finally teleport party into instance
+ final L2Party party = player.getParty();
+ for (L2PcInstance partyMember : party.getPartyMembers())
{
- if (!checkConditions(player, index))
- return;
+ if (partyMember.getQuestState(qn) == null)
+ newQuestState(partyMember);
+ world.allowed.add(partyMember.getObjectId());
- // Creating dynamic instance without template
- final int instanceId = InstanceManager.getInstance().createDynamicInstance(null);
- final Instance inst = InstanceManager.getInstance().getInstance(instanceId);
- // set name for the kamaloka
- inst.setName(InstanceManager.getInstance().getInstanceIdName(templateId));
- // set return location
- final int[] returnLoc = { player.getX(), player.getY(), player.getZ() };
- inst.setSpawnLoc(returnLoc);
- // disable summon friend into instance
- inst.setAllowSummon(false);
- // set duration and empty destroy time
- inst.setDuration(DURATION[index] * 60000);
- inst.setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000);
-
- // Creating new instanceWorld, using our instanceId and templateId
- world = new KamaWorld();
- world.instanceId = instanceId;
- world.templateId = templateId;
- // set index for easy access to the arrays
- ((KamaWorld)world).index = index;
- InstanceManager.getInstance().addWorld(world);
- world.status = 0;
- // spawn npcs
- spawnKama((KamaWorld)world);
-
- // and finally teleport party into instance
- final L2Party party = player.getParty();
- for (L2PcInstance partyMember : party.getPartyMembers())
- {
- if (partyMember.getQuestState(qn) == null)
- newQuestState(partyMember);
- world.allowed.add(partyMember.getObjectId());
-
- removeBuffs(partyMember);
- teleportPlayer(partyMember, TELEPORTS[index], instanceId);
- }
- return;
+ removeBuffs(partyMember);
+ teleportPlayer(partyMember, TELEPORTS[index], instanceId);
}
+ return;
}
/**
@@ -824,10 +821,8 @@ public class Kamaloka extends Quest
{
if (player.isInParty() && player.getParty().isLeader(player))
return "32496.htm";
- else
- return "32496-no.htm";
+ return "32496-no.htm";
}
-
return "";
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index e71b0fa6ed..1aeab6f408 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -38,9 +38,8 @@ import com.l2jserver.gameserver.util.Util;
import com.l2jserver.util.Rnd;
/**
- ** @author Gnacik
- **
- ** 2010-10-15 Based on official server Naia
+ * 2010-10-15 Based on official server Naia
+ * @author Gnacik
*/
public class NornilsGarden extends Quest
{
@@ -254,41 +253,38 @@ public class NornilsGarden extends Quest
return null;
}
// Creating new instance
- else
+ String result = checkConditions(npc, player);
+ if (!(result.equalsIgnoreCase("ok")))
+ return result;
+
+ final int instanceId = InstanceManager.getInstance().createDynamicInstance("NornilsGarden.xml");
+ final Instance inst = InstanceManager.getInstance().getInstance(instanceId);
+
+ inst.setName(InstanceManager.getInstance().getInstanceIdName(INSTANCE_ID));
+ final int[] returnLoc = { player.getX(), player.getY(), player.getZ() };
+ inst.setSpawnLoc(returnLoc);
+ inst.setAllowSummon(false);
+ inst.setDuration(DURATION_TIME * 60000);
+ inst.setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000);
+ world = new NornilsWorld();
+ world.instanceId = instanceId;
+ world.templateId = INSTANCE_ID;
+ InstanceManager.getInstance().addWorld(world);
+ _log.info("Nornils Garden: started, Instance: " + instanceId + " created by player: " + player.getName());
+
+ prepareInstance((NornilsWorld) world);
+
+ // and finally teleport party into instance
+ final L2Party party = player.getParty();
+ if(party != null)
{
- String result = checkConditions(npc, player);
- if (!(result.equalsIgnoreCase("ok")))
- return result;
-
- final int instanceId = InstanceManager.getInstance().createDynamicInstance("NornilsGarden.xml");
- final Instance inst = InstanceManager.getInstance().getInstance(instanceId);
-
- inst.setName(InstanceManager.getInstance().getInstanceIdName(INSTANCE_ID));
- final int[] returnLoc = { player.getX(), player.getY(), player.getZ() };
- inst.setSpawnLoc(returnLoc);
- inst.setAllowSummon(false);
- inst.setDuration(DURATION_TIME * 60000);
- inst.setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000);
- world = new NornilsWorld();
- world.instanceId = instanceId;
- world.templateId = INSTANCE_ID;
- InstanceManager.getInstance().addWorld(world);
- _log.info("Nornils Garden: started, Instance: " + instanceId + " created by player: " + player.getName());
-
- prepareInstance((NornilsWorld) world);
-
- // and finally teleport party into instance
- final L2Party party = player.getParty();
- if(party != null)
+ for (L2PcInstance partyMember : party.getPartyMembers())
{
- for (L2PcInstance partyMember : party.getPartyMembers())
- {
- world.allowed.add(partyMember.getObjectId());
- teleportPlayer(partyMember, SPAWN_PPL, instanceId);
- }
+ world.allowed.add(partyMember.getObjectId());
+ teleportPlayer(partyMember, SPAWN_PPL, instanceId);
}
- return null;
}
+ return null;
}
private void prepareInstance(NornilsWorld world)
@@ -558,8 +554,7 @@ public class NornilsGarden extends Quest
{
return npc.getNpcId()+"-01.html";
}
- else
- return getNoQuestMsg(player);
+ return getNoQuestMsg(player);
}
return null;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
index c2c151f758..871137ea61 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
@@ -192,20 +192,17 @@ public class PailakaDevilsLegacy extends Quest
return;
}
//New instance
- else
- {
- final int instanceId = InstanceManager.getInstance().createDynamicInstance("PailakaDevilsLegacy.xml");
+ final int instanceId = InstanceManager.getInstance().createDynamicInstance("PailakaDevilsLegacy.xml");
- world = new InstanceWorld();
- world.instanceId = instanceId;
- world.templateId = INSTANCE_ID;
- InstanceManager.getInstance().addWorld(world);
+ world = new InstanceWorld();
+ world.instanceId = instanceId;
+ world.templateId = INSTANCE_ID;
+ InstanceManager.getInstance().addWorld(world);
- world.allowed.add(player.getObjectId());
- teleportPlayer(player, TELEPORT, instanceId);
-
- _lematanNpc = addSpawn(LEMATAN, 88108, -209252, -3744, 64255, false, 0, false, instanceId);
- }
+ world.allowed.add(player.getObjectId());
+ teleportPlayer(player, TELEPORT, instanceId);
+
+ _lematanNpc = addSpawn(LEMATAN, 88108, -209252, -3744, 64255, false, 0, false, instanceId);
}
@@ -242,10 +239,7 @@ public class PailakaDevilsLegacy extends Quest
st.set("cond","2");
return "32498-07.htm";
}
- else
- {
- return "32498-09.htm";
- }
+ return "32498-09.htm";
}
else if (event.equalsIgnoreCase("32498-05.htm"))
{
@@ -332,8 +326,7 @@ public class PailakaDevilsLegacy extends Quest
final QuestState st = player.getQuestState(qn);
if (st != null && npc.getNpcId() == ADVENTURER2 && st.isCompleted())
return "32511-03.htm";
- else
- return npc.getNpcId() + ".htm";
+ return npc.getNpcId() + ".htm";
}
@Override
@@ -358,8 +351,7 @@ public class PailakaDevilsLegacy extends Quest
case State.STARTED:
if (cond > 1)
return "32498-08.htm";
- else
- return "32498-06.htm";
+ return "32498-06.htm";
case State.COMPLETED:
return "32498-10.htm";
default:
@@ -368,8 +360,7 @@ public class PailakaDevilsLegacy extends Quest
case SUPPORTER:
if(st.getInt("cond") > 2)
return "32501-04.htm";
- else
- return "32501-01.htm";
+ return "32501-01.htm";
case ADVENTURER1:
if(player.getPet() == null)
{
@@ -382,8 +373,7 @@ public class PailakaDevilsLegacy extends Quest
st.giveItems(ENH_SWORD1, 1);
return "32508-03.htm";
}
- else
- return "32508-02.htm";
+ return "32508-02.htm";
}
else if (st.getQuestItemsCount(ENH_SWORD1) > 0)
{
@@ -394,16 +384,14 @@ public class PailakaDevilsLegacy extends Quest
st.giveItems(ENH_SWORD2, 1);
return "32508-05.htm";
}
- else
- return "32508-04.htm";
+ return "32508-04.htm";
}
else if (st.getQuestItemsCount(ENH_SWORD2) > 0)
return "32508-06.htm";
else
return "32508-00.htm";
}
- else
- return "32508-07.htm";
+ return "32508-07.htm";
case ADVENTURER2:
if (player.getPet() == null)
{
@@ -424,8 +412,7 @@ public class PailakaDevilsLegacy extends Quest
}
return "32511-01.htm";
}
- else
- return "32511-02.htm";
+ return "32511-02.htm";
}
return getNoQuestMsg(player);
}
@@ -558,6 +545,7 @@ public class PailakaDevilsLegacy extends Quest
_instanceId = id;
}
+ @Override
public void run()
{
try
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java
index b75d5e7558..39fa8a751e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java
@@ -163,18 +163,15 @@ public class PailakaSongOfIceAndFire extends Quest
return;
}
//New instance
- else
- {
- final int instanceId = InstanceManager.getInstance().createDynamicInstance("PailakaSongOfIceAndFire.xml");
-
- world = new InstanceWorld();
- world.instanceId = instanceId;
- world.templateId = INSTANCE_ID;
- InstanceManager.getInstance().addWorld(world);
-
- world.allowed.add(player.getObjectId());
- teleportPlayer(player, TELEPORT, instanceId);
- }
+ final int instanceId = InstanceManager.getInstance().createDynamicInstance("PailakaSongOfIceAndFire.xml");
+
+ world = new InstanceWorld();
+ world.instanceId = instanceId;
+ world.templateId = INSTANCE_ID;
+ InstanceManager.getInstance().addWorld(world);
+
+ world.allowed.add(player.getObjectId());
+ teleportPlayer(player, TELEPORT, instanceId);
}
@@ -285,8 +282,7 @@ public class PailakaSongOfIceAndFire extends Quest
case State.STARTED:
if (cond > 1)
return "32497-00.htm";
- else
- return "32497-03.htm";
+ return "32497-03.htm";
case State.COMPLETED:
return "32497-07.htm";
default:
@@ -295,8 +291,7 @@ public class PailakaSongOfIceAndFire extends Quest
case SINAI:
if (cond > 1)
return "32500-00.htm";
- else
- return "32500-01.htm";
+ return "32500-01.htm";
case INSPECTOR:
switch (st.getInt("cond"))
{
@@ -433,6 +428,7 @@ public class PailakaSongOfIceAndFire extends Quest
_instanceId = id;
}
+ @Override
public void run()
{
try
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/RankuFloor/RankuFloor.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/RankuFloor/RankuFloor.java
index 3b65a757c4..2fd5c0e04e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/RankuFloor/RankuFloor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/RankuFloor/RankuFloor.java
@@ -218,36 +218,31 @@ public class RankuFloor extends Quest
player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
return 0;
}
- else
- {
- teleportPlayer(player, ENTRY_POINT, world.instanceId);
- return world.instanceId;
- }
+ teleportPlayer(player, ENTRY_POINT, world.instanceId);
+ return world.instanceId;
}
- else
+
+ if (!checkTeleport(player))
{
- if (!checkTeleport(player))
- {
- return 0;
- }
-
- instanceId = InstanceManager.getInstance().createDynamicInstance(template);
- world = new RWorld();
- world.instanceId = instanceId;
- world.templateId = INSTANCEID;
- world.status = 0;
- InstanceManager.getInstance().addWorld(world);
- _log.info("Tower of Infinitum - Ranku floor started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-
- for (L2PcInstance partyMember : player.getParty().getPartyMembers())
- {
- teleportPlayer(partyMember, ENTRY_POINT, instanceId);
- partyMember.destroyItemByItemId("Quest", SEAL_BREAKER_10, 1, null, true);
- world.allowed.add(partyMember.getObjectId());
- }
-
- return instanceId;
+ return 0;
+ }
+
+ instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+ world = new RWorld();
+ world.instanceId = instanceId;
+ world.templateId = INSTANCEID;
+ world.status = 0;
+ InstanceManager.getInstance().addWorld(world);
+ _log.info("Tower of Infinitum - Ranku floor started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+
+ for (L2PcInstance partyMember : player.getParty().getPartyMembers())
+ {
+ teleportPlayer(partyMember, ENTRY_POINT, instanceId);
+ partyMember.destroyItemByItemId("Quest", SEAL_BREAKER_10, 1, null, true);
+ world.allowed.add(partyMember.getObjectId());
}
+
+ return instanceId;
}
public void setReenterTime(InstanceWorld world)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
index 3ba654dd21..36d9576ea7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
@@ -431,36 +431,33 @@ public class Stage1 extends Quest
return world.instanceId;
}
//New instance
+ if (!checkConditions(player))
+ return 0;
+ instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+ world = new SOD1World();
+ world.instanceId = instanceId;
+ world.status = 0;
+ InstanceManager.getInstance().addWorld(world);
+ spawnState((SOD1World)world);
+ for (L2DoorInstance door : InstanceManager.getInstance().getInstance(instanceId).getDoors())
+ if (Util.contains(ATTACKABLE_DOORS, door.getDoorId()))
+ door.setIsAttackableDoor(true);
+ _log.info("Seed of Destruction started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+ // teleport players
+ if (player.getParty() == null || player.getParty().getCommandChannel() == null)
+ {
+ teleportPlayer(player, coords, instanceId);
+ world.allowed.add(player.getObjectId());
+ }
else
{
- if (!checkConditions(player))
- return 0;
- instanceId = InstanceManager.getInstance().createDynamicInstance(template);
- world = new SOD1World();
- world.instanceId = instanceId;
- world.status = 0;
- InstanceManager.getInstance().addWorld(world);
- spawnState((SOD1World)world);
- for (L2DoorInstance door : InstanceManager.getInstance().getInstance(instanceId).getDoors())
- if (Util.contains(ATTACKABLE_DOORS, door.getDoorId()))
- door.setIsAttackableDoor(true);
- _log.info("Seed of Destruction started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
- // teleport players
- if (player.getParty() == null || player.getParty().getCommandChannel() == null)
+ for (L2PcInstance channelMember : player.getParty().getCommandChannel().getMembers())
{
- teleportPlayer(player, coords, instanceId);
- world.allowed.add(player.getObjectId());
- }
- else
- {
- for (L2PcInstance channelMember : player.getParty().getCommandChannel().getMembers())
- {
- teleportPlayer(channelMember, coords, instanceId);
- world.allowed.add(channelMember.getObjectId());
- }
+ teleportPlayer(channelMember, coords, instanceId);
+ world.allowed.add(channelMember.getObjectId());
}
- return instanceId;
}
+ return instanceId;
}
protected boolean checkKillProgress(L2Npc mob, SOD1World world)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
index 01e7696bd8..c70b83b550 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
@@ -198,40 +198,37 @@ public class HallOfSuffering extends Quest
return world.instanceId;
}
//New instance
+ if (!checkConditions(player))
+ return 0;
+ L2Party party = player.getParty();
+ instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+ world = new HSWorld();
+ world.instanceId = instanceId;
+ world.templateId = INSTANCEID;
+ world.status = 0;
+ ((HSWorld)world).startTime = System.currentTimeMillis();
+ ((HSWorld)world).ptLeaderName = player.getName();
+ InstanceManager.getInstance().addWorld(world);
+ _log.info("Hall Of Suffering started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+ runTumors((HSWorld)world);
+
+ // teleport players
+ if (player.getParty() == null)
+ {
+ teleportPlayer(player, coords, instanceId);
+ world.allowed.add(player.getObjectId());
+ }
else
{
- if (!checkConditions(player))
- return 0;
- L2Party party = player.getParty();
- instanceId = InstanceManager.getInstance().createDynamicInstance(template);
- world = new HSWorld();
- world.instanceId = instanceId;
- world.templateId = INSTANCEID;
- world.status = 0;
- ((HSWorld)world).startTime = System.currentTimeMillis();
- ((HSWorld)world).ptLeaderName = player.getName();
- InstanceManager.getInstance().addWorld(world);
- _log.info("Hall Of Suffering started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
- runTumors((HSWorld)world);
-
- // teleport players
- if (player.getParty() == null)
- {
- teleportPlayer(player, coords, instanceId);
- world.allowed.add(player.getObjectId());
- }
- else
+ for (L2PcInstance partyMember : party.getPartyMembers())
{
- for (L2PcInstance partyMember : party.getPartyMembers())
- {
- teleportPlayer(partyMember, coords, instanceId);
- world.allowed.add(partyMember.getObjectId());
- if (partyMember.getQuestState(qn) == null)
- newQuestState(partyMember);
- }
+ teleportPlayer(partyMember, coords, instanceId);
+ world.allowed.add(partyMember.getObjectId());
+ if (partyMember.getQuestState(qn) == null)
+ newQuestState(partyMember);
}
- return instanceId;
}
+ return instanceId;
}
protected boolean checkKillProgress(L2Npc mob, HSWorld world)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java
index 2e55e6012f..c0e004873b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java
@@ -175,6 +175,7 @@ public class eventmodElpies extends Event
// Schedule Event end
_eventTask = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
{
+ @Override
public void run()
{
timeUp();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java
index 118434dd2b..fff34cf195 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java
@@ -144,6 +144,7 @@ public class eventmodRabbits extends Event
// Schedule Event end
_eventTask = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
{
+ @Override
public void run()
{
timeUp();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
index e202019ee5..45bf14c555 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
@@ -36,8 +36,7 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.util.Rnd;
/**
- ** @author Gnacik
- **
+ * @author Gnacik
*/
public class eventmodRace extends Event
{
@@ -137,6 +136,7 @@ public class eventmodRace extends Event
// Schedule Event end
_eventTask = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
{
+ @Override
public void run()
{
StartRace();
@@ -186,6 +186,7 @@ public class eventmodRace extends Event
// Schedule timeup for Race
_eventTask = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
{
+ @Override
public void run()
{
timeUp();
@@ -319,8 +320,7 @@ public class eventmodRace extends Event
winRace(player);
return "900104-winner.htm";
}
- else
- return "900104-notrans.htm";
+ return "900104-notrans.htm";
}
return htmltext;
}
@@ -337,9 +337,10 @@ public class eventmodRace extends Event
if (npc.getNpcId() == _start_npc)
{
if (_isRaceStarted)
+ {
return _start_npc+"-started-"+isRacing(player)+".htm";
- else
- return _start_npc+"-"+isRacing(player)+".htm";
+ }
+ return _start_npc+"-"+isRacing(player)+".htm";
}
else if (npc.getNpcId() == _stop_npc && _isRaceStarted)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
index 0ad33e48c1..c1ee955238 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
@@ -22,11 +22,9 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
- ** @author Gnacik
- **
- ** 2010-08-07 Based on Freya PTS
+ * 2010-08-07 Based on Freya PTS
+ * @author Gnacik
*/
-
public class Q10288_SecretMission extends Quest
{
private static final String qn = "10288_SecretMission";
@@ -143,9 +141,10 @@ public class Q10288_SecretMission extends Quest
if (npc.getNpcId() == _aquilani)
{
if (st.isCompleted())
+ {
return "32780-01.html";
- else
- return "32780-00.html";
+ }
+ return "32780-00.html";
}
return null;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q20_BringUpWithLove/Q20_BringUpWithLove.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q20_BringUpWithLove/Q20_BringUpWithLove.java
index 341433bd70..fdbdcf49bc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q20_BringUpWithLove/Q20_BringUpWithLove.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q20_BringUpWithLove/Q20_BringUpWithLove.java
@@ -22,11 +22,9 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
- ** @author Gnacik
- **
- ** 2010-09-29 Based on official server Franz
+ * 2010-09-29 Based on official server Franz
+ * @author Gnacik
*/
-
public class Q20_BringUpWithLove extends Quest
{
private static final String qn = "20_BringUpWithLove";
@@ -57,9 +55,10 @@ public class Q20_BringUpWithLove extends Quest
else if (event.equalsIgnoreCase("31537-03.htm"))
{
if (st.hasQuestItems(_beast_whip))
+ {
return "31537-03a.htm";
- else
- st.giveItems(_beast_whip, 1);
+ }
+ st.giveItems(_beast_whip, 1);
}
else if (event.equalsIgnoreCase("31537-15.htm"))
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java
index 4edb1055ae..c627e7f79d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java
@@ -72,7 +72,7 @@ public class Q290_ThreatRemoval extends Quest
QuestState st = player.getQuestState(qn);
if (st == null)
return htmltext;
- int[][] i = REWARD[(int) Rnd.get(REWARD.length)];
+ int[][] i = REWARD[Rnd.get(REWARD.length)];
int b = Rnd.get(i.length);
if (npc.getNpcId() == PINAPS)
@@ -148,7 +148,7 @@ public class Q290_ThreatRemoval extends Quest
if (Util.contains(MOBS1, npcId))
{
int chance = (int) (25 * Config.RATE_QUEST_DROP);
- int numItems = (int) (chance / 100);
+ int numItems = (chance / 100);
chance = chance % 100;
if (st.getRandom(100) < chance)
numItems++;
@@ -161,7 +161,7 @@ public class Q290_ThreatRemoval extends Quest
else if (Util.contains(MOBS2, npcId))
{
int chance = (int) (30 * Config.RATE_QUEST_DROP);
- int numItems = (int) (chance / 100);
+ int numItems = (chance / 100);
chance = chance % 100;
if (st.getRandom(100) < chance)
numItems++;
@@ -174,7 +174,7 @@ public class Q290_ThreatRemoval extends Quest
else if (Util.contains(MOBS3, npcId))
{
int chance = (int) (50 * Config.RATE_QUEST_DROP);
- int numItems = (int) (chance / 100);
+ int numItems = (chance / 100);
chance = chance % 100;
if (st.getRandom(100) < chance)
numItems++;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java
index 8f86eebc17..38ad458315 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java
@@ -232,6 +232,7 @@ public class Q309_ForAGoodCause extends Quest
return htmltext;
}
+ @Override
public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
{
QuestState st = player.getQuestState(qn);
@@ -271,10 +272,7 @@ public class Q309_ForAGoodCause extends Quest
st.playSound("ItemSound.quest_finish");
return "32647-16.htm";
}
- else
- {
- return "32647-15.htm";
- }
+ return "32647-15.htm";
}
private String onRecipeExchangeRequest(QuestState st, int recipe, int takeid, int quanty)
@@ -286,10 +284,7 @@ public class Q309_ForAGoodCause extends Quest
st.playSound("ItemSound.quest_finish");
return "32647-16.htm";
}
- else
- {
- return "32647-15.htm";
- }
+ return "32647-15.htm";
}
public Q309_ForAGoodCause(int id, String name, String descr)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
index 5ea16082f2..bd0b765d48 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java
@@ -374,8 +374,8 @@ public class Q350_EnhanceYourWeapon extends Quest
/**
* Calculate the leveling chance of Soul Crystals based on the attacker that killed this L2Attackable
- *
- * @param attacker The player that last killed this L2Attackable
+ * @param mob
+ * @param killer The player that last killed this L2Attackable
* $ Rewrite 06.12.06 - Yesod
* $ Rewrite 08.01.10 - Gigiikun
*/
@@ -524,8 +524,7 @@ public class Q350_EnhanceYourWeapon extends Quest
if (ret != null)
return null;
- else
- ret = _soulCrystals.get(itemId);
+ ret = _soulCrystals.get(itemId);
}
return ret;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q423_TakeYourBestShot/Q423_TakeYourBestShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q423_TakeYourBestShot/Q423_TakeYourBestShot.java
index 2c7dd17044..67530f8408 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q423_TakeYourBestShot/Q423_TakeYourBestShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q423_TakeYourBestShot/Q423_TakeYourBestShot.java
@@ -135,8 +135,7 @@ public class Q423_TakeYourBestShot extends Quest
if (npc.isInsideRadius(96782, 85918, 100, true))
return "32740-ugoros.htm";
- else
- return "32740.htm";
+ return "32740.htm";
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
index 51da509fd9..8d947e67bf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java
@@ -35,9 +35,7 @@ import com.l2jserver.gameserver.util.Util;
import com.l2jserver.util.Rnd;
/**
- *
* @author Gigiikun
- *
*/
public final class Q511_AwlUnderFoot extends Quest
{
@@ -133,44 +131,43 @@ public final class Q511_AwlUnderFoot extends Quest
return "";
}
//New instance
- else
+ if (ret != null)
{
- if (ret != null)
- return ret;
- ret = checkConditions(player);
- if (ret != null)
- return ret;
- L2Party party = player.getParty();
- int instanceId = InstanceManager.getInstance().createDynamicInstance(template);
- Instance ins = InstanceManager.getInstance().getInstance(instanceId);
- ins.setSpawnLoc(new int[]{player.getX(),player.getY(),player.getZ()});
- world = new FAUWorld();
- world.instanceId = instanceId;
- world.templateId = dungeon.getInstanceId();
- world.status = 0;
- dungeon.setReEnterTime(System.currentTimeMillis() + REENTERTIME);
- InstanceManager.getInstance().addWorld(world);
- _log.info("Fortress AwlUnderFoot started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
- ThreadPoolManager.getInstance().scheduleGeneral(new spawnRaid((FAUWorld) world), RAID_SPAWN_DELAY);
+ return ret;
+ }
+ ret = checkConditions(player);
+ if (ret != null)
+ return ret;
+ L2Party party = player.getParty();
+ int instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+ Instance ins = InstanceManager.getInstance().getInstance(instanceId);
+ ins.setSpawnLoc(new int[]{player.getX(),player.getY(),player.getZ()});
+ world = new FAUWorld();
+ world.instanceId = instanceId;
+ world.templateId = dungeon.getInstanceId();
+ world.status = 0;
+ dungeon.setReEnterTime(System.currentTimeMillis() + REENTERTIME);
+ InstanceManager.getInstance().addWorld(world);
+ _log.info("Fortress AwlUnderFoot started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+ ThreadPoolManager.getInstance().scheduleGeneral(new spawnRaid((FAUWorld) world), RAID_SPAWN_DELAY);
- // teleport players
- if (player.getParty() == null)
- {
- teleportPlayer(player, coords, instanceId);
- world.allowed.add(player.getObjectId());
- }
- else
+ // teleport players
+ if (player.getParty() == null)
+ {
+ teleportPlayer(player, coords, instanceId);
+ world.allowed.add(player.getObjectId());
+ }
+ else
+ {
+ for (L2PcInstance partyMember : party.getPartyMembers())
{
- for (L2PcInstance partyMember : party.getPartyMembers())
- {
- teleportPlayer(partyMember, coords, instanceId);
- world.allowed.add(partyMember.getObjectId());
- if (partyMember.getQuestState(qn) == null)
- newQuestState(partyMember);
- }
+ teleportPlayer(partyMember, coords, instanceId);
+ world.allowed.add(partyMember.getObjectId());
+ if (partyMember.getQuestState(qn) == null)
+ newQuestState(partyMember);
}
- return getHtm(player.getHtmlPrefix(), "FortressWarden-08.htm").replace("%clan%", player.getClan().getName());
}
+ return getHtm(player.getHtmlPrefix(), "FortressWarden-08.htm").replace("%clan%", player.getClan().getName());
}
private class spawnRaid implements Runnable
@@ -182,6 +179,7 @@ public final class Q511_AwlUnderFoot extends Quest
_world = world;
}
+ @Override
public void run()
{
try
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q636_TruthBeyond/Q636_TruthBeyond.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q636_TruthBeyond/Q636_TruthBeyond.java
index 6da9377e11..de74d90b93 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q636_TruthBeyond/Q636_TruthBeyond.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q636_TruthBeyond/Q636_TruthBeyond.java
@@ -97,13 +97,12 @@ public final class Q636_TruthBeyond extends Quest
}
else if (st.getState() == State.STARTED) // Flauron only
{
- if (Integer.parseInt(st.get("cond")) == 1)
- return "32010-01.htm";
- else
+ if (st.getInt("cond") == 1)
{
- st.exitQuest(true);
- return "32010-03.htm";
+ return "32010-01.htm";
}
+ st.exitQuest(true);
+ return "32010-03.htm";
}
return getNoQuestMsg(player);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java
index ee8a891203..59fcda7f05 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java
@@ -110,8 +110,7 @@ public final class Q637_ThroughOnceMore extends Quest
st.playSound("ItemSound.quest_finish");
return "32010-05.htm";
}
- else
- return "32010-04.htm";
+ return "32010-04.htm";
}
return getNoQuestMsg(player);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagaOfTheDuelist.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagaOfTheDuelist.java
index c03ade757b..3901f57bd9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagaOfTheDuelist.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagaOfTheDuelist.java
@@ -88,13 +88,11 @@ public class SagaOfTheDuelist extends SagasSuperClass
st.giveItems(TOPQUALITYMEAT, 1);
return "tunatun_01.htm";
}
- else
- return "tunatun_02.htm";
+ return "tunatun_02.htm";
}
}
return htmltext;
}
- else
- return super.onTalk(npc, player);
+ return super.onTalk(npc, player);
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
index e58dd66c29..94c0df17e9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
@@ -187,8 +187,7 @@ public class SagasSuperClass extends QuestJython
{
if (prevclass.length == 1)
return -1;
- else
- return prevclass[1];
+ return prevclass[1];
}
return prevclass[0];
}
@@ -779,21 +778,21 @@ public class SagasSuperClass extends QuestJython
{
L2PcInstance quest_player = (L2PcInstance) L2World.getInstance().findObject(_SpawnList.get(npc));
if (quest_player == null)
+ {
return null;
- else
+ }
+
+ for (L2Object obj : targets)
{
- for (L2Object obj : targets)
+ if (obj == quest_player || obj == npc)
{
- if (obj == quest_player || obj == npc)
- {
- QuestState st2 = findRightState(npc);
- if (st2 == null)
- return null;
- AutoChat(npc, Text[5].replace("PLAYERNAME", player.getName()));
- cancelQuestTimer("Archon Hellisha has despawned", npc, st2.getPlayer());
- st2.set("spawned", "0");
- DeleteSpawn(st2, npc);
- }
+ QuestState st2 = findRightState(npc);
+ if (st2 == null)
+ return null;
+ AutoChat(npc, Text[5].replace("PLAYERNAME", player.getName()));
+ cancelQuestTimer("Archon Hellisha has despawned", npc, st2.getPlayer());
+ st2.set("spawned", "0");
+ DeleteSpawn(st2, npc);
}
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/retail/PriestOfBlessing/PriestOfBlessing.java b/L2J_DataPack_BETA/dist/game/data/scripts/retail/PriestOfBlessing/PriestOfBlessing.java
index 6abb617dbe..95873acd95 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/retail/PriestOfBlessing/PriestOfBlessing.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/retail/PriestOfBlessing/PriestOfBlessing.java
@@ -161,10 +161,7 @@ public class PriestOfBlessing extends Quest
}
return null;
}
- else
- {
- htmltext = "32783-adena.htm";
- }
+ htmltext = "32783-adena.htm";
}
else if (event.equalsIgnoreCase("buy_hourglass"))
{
@@ -199,10 +196,7 @@ public class PriestOfBlessing extends Quest
}
return null;
}
- else
- {
- htmltext = "32783-adena.htm";
- }
+ htmltext = "32783-adena.htm";
}
return htmltext;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/teleports/ElrokiTeleporters/ElrokiTeleporters.java b/L2J_DataPack_BETA/dist/game/data/scripts/teleports/ElrokiTeleporters/ElrokiTeleporters.java
index b157685179..5eac225968 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/teleports/ElrokiTeleporters/ElrokiTeleporters.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/teleports/ElrokiTeleporters/ElrokiTeleporters.java
@@ -38,9 +38,10 @@ public class ElrokiTeleporters extends Quest
{
case 32111:
if (player.isInCombat())
+ {
return "32111-no.htm";
- else
- player.teleToLocation(4990,-1879,-3178);
+ }
+ player.teleToLocation(4990,-1879,-3178);
break;
case 32112:
player.teleToLocation(7557,-5513,-3221);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipController.java
index fdd27bbec6..b6d9b50b27 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipController.java
@@ -375,6 +375,7 @@ public abstract class AirShipController extends Quest
private final class DecayTask implements Runnable
{
+ @Override
public void run()
{
if (_dockedShip != null)
@@ -384,6 +385,7 @@ public abstract class AirShipController extends Quest
private final class DepartTask implements Runnable
{
+ @Override
public void run()
{
if (_dockedShip != null
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/EngineerLekon/EngineerLekon.java b/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/EngineerLekon/EngineerLekon.java
index 9dca21db53..c47d767dd2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/EngineerLekon/EngineerLekon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/EngineerLekon/EngineerLekon.java
@@ -64,8 +64,7 @@ public class EngineerLekon extends Quest
player.addItem("AirShipLicense", LICENSE, 1, npc, true);
return null;
}
- else
- return event;
+ return event;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml
index 897b858ae9..815002831f 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml
@@ -283,7 +283,7 @@
<skill id="22018" levels="1" name="Santa Claus' Gift - Luck">
<!-- Confirmed CT2.5 -->
<table name="#extractableItems">
- 20107,1,99.99948;20108,1,0.00051
+ 20108,1,100
</table>
<set name="capsuled_items_skill" val="#extractableItems" />
<set name="itemConsumeCount" val="1" />
--
GitLab