From c044fc0319142710354945495da93c026e24e8bd Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 17 Dec 2021 22:11:27 +0000 Subject: [PATCH] Reduced queries for storing clan values. --- .../game/data/scripts/ai/others/Ballista.java | 2 +- .../ai/others/ClanTrader/ClanTrader.java | 2 +- .../ai/others/FameManager/FameManager.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../Q00245_ComeToMe/Q00245_ComeToMe.java | 2 +- .../Q00508_AClansReputation.java | 2 +- .../Q00509_AClansFame/Q00509_AClansFame.java | 2 +- .../Q00510_AClansPrestige.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../gameserver/model/actor/Player.java | 8 +-- .../l2jmobius/gameserver/model/clan/Clan.java | 55 +++++------------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../game/data/scripts/ai/others/Ballista.java | 2 +- .../ai/others/ClanTrader/ClanTrader.java | 2 +- .../ai/others/FameManager/FameManager.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../Q00245_ComeToMe/Q00245_ComeToMe.java | 2 +- .../Q00508_AClansReputation.java | 2 +- .../Q00509_AClansFame/Q00509_AClansFame.java | 2 +- .../Q00510_AClansPrestige.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../gameserver/model/actor/Player.java | 8 +-- .../l2jmobius/gameserver/model/clan/Clan.java | 55 +++++------------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../game/data/scripts/ai/others/Ballista.java | 2 +- .../ai/others/ClanTrader/ClanTrader.java | 2 +- .../ai/others/FameManager/FameManager.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../Q00245_ComeToMe/Q00245_ComeToMe.java | 2 +- .../Q00508_AClansReputation.java | 2 +- .../Q00509_AClansFame/Q00509_AClansFame.java | 2 +- .../Q00510_AClansPrestige.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../gameserver/model/actor/Player.java | 8 +-- .../l2jmobius/gameserver/model/clan/Clan.java | 55 +++++------------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../game/data/scripts/ai/others/Ballista.java | 2 +- .../ai/others/ClanTrader/ClanTrader.java | 2 +- .../ai/others/FameManager/FameManager.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../Q00245_ComeToMe/Q00245_ComeToMe.java | 2 +- .../Q00508_AClansReputation.java | 2 +- .../Q00509_AClansFame/Q00509_AClansFame.java | 2 +- .../Q00510_AClansPrestige.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../gameserver/model/actor/Player.java | 8 +-- .../l2jmobius/gameserver/model/clan/Clan.java | 55 +++++------------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../game/data/scripts/ai/others/Ballista.java | 2 +- .../ai/others/ClanTrader/ClanTrader.java | 2 +- .../ai/others/FameManager/FameManager.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 2 +- .../gameserver/model/actor/Player.java | 8 +-- .../l2jmobius/gameserver/model/clan/Clan.java | 41 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 2 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../pledgeV2/RequestExPledgeMasteryReset.java | 2 +- .../pledgeV2/RequestExPledgeMasterySet.java | 2 +- .../RequestExPledgeSkillActivate.java | 2 +- .../game/data/scripts/ai/others/Ballista.java | 2 +- .../ai/others/ClanTrader/ClanTrader.java | 2 +- .../ai/others/FameManager/FameManager.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 2 +- .../gameserver/model/actor/Player.java | 8 +-- .../l2jmobius/gameserver/model/clan/Clan.java | 41 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 2 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../pledgeV2/RequestExPledgeMasteryReset.java | 2 +- .../pledgeV2/RequestExPledgeMasterySet.java | 2 +- .../RequestExPledgeSkillActivate.java | 2 +- .../game/data/scripts/ai/others/Ballista.java | 2 +- .../ai/others/ClanTrader/ClanTrader.java | 2 +- .../ai/others/FameManager/FameManager.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 2 +- .../gameserver/model/actor/Player.java | 8 +-- .../l2jmobius/gameserver/model/clan/Clan.java | 41 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 2 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../pledgeV2/RequestExPledgeMasteryReset.java | 2 +- .../pledgeV2/RequestExPledgeMasterySet.java | 2 +- .../RequestExPledgeSkillActivate.java | 2 +- .../game/data/scripts/ai/others/Ballista.java | 2 +- .../ai/others/ClanTrader/ClanTrader.java | 2 +- .../ai/others/FameManager/FameManager.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 2 +- .../gameserver/model/actor/Player.java | 8 +-- .../l2jmobius/gameserver/model/clan/Clan.java | 41 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 2 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../pledgeV2/RequestExPledgeMasteryReset.java | 2 +- .../pledgeV2/RequestExPledgeMasterySet.java | 2 +- .../RequestExPledgeSkillActivate.java | 2 +- .../game/data/scripts/ai/others/Ballista.java | 2 +- .../ai/others/ClanTrader/ClanTrader.java | 2 +- .../ai/others/FameManager/FameManager.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 2 +- .../gameserver/model/actor/Player.java | 8 +-- .../l2jmobius/gameserver/model/clan/Clan.java | 41 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 2 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../pledgeV2/RequestExPledgeMasteryReset.java | 2 +- .../pledgeV2/RequestExPledgeMasterySet.java | 2 +- .../RequestExPledgeSkillActivate.java | 2 +- .../game/data/scripts/ai/others/Ballista.java | 2 +- .../ai/others/ClanTrader/ClanTrader.java | 2 +- .../ai/others/FameManager/FameManager.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 2 +- .../gameserver/model/actor/Player.java | 8 +-- .../l2jmobius/gameserver/model/clan/Clan.java | 41 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 2 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../pledgeV2/RequestExPledgeMasteryReset.java | 2 +- .../pledgeV2/RequestExPledgeMasterySet.java | 2 +- .../RequestExPledgeSkillActivate.java | 2 +- .../game/data/scripts/ai/others/Ballista.java | 2 +- .../ai/others/ClanTrader/ClanTrader.java | 2 +- .../ai/others/FameManager/FameManager.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 2 +- .../gameserver/model/actor/Player.java | 8 +-- .../l2jmobius/gameserver/model/clan/Clan.java | 41 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 2 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../pledgeV2/RequestExPledgeMasteryReset.java | 2 +- .../pledgeV2/RequestExPledgeMasterySet.java | 2 +- .../RequestExPledgeSkillActivate.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 5 ++ .../gameserver/data/sql/ClanTable.java | 8 +++ .../admincommandhandlers/AdminPledge.java | 2 +- .../gameserver/model/actor/Player.java | 10 ++-- .../l2jmobius/gameserver/model/clan/Clan.java | 17 ++---- .../gameserver/model/olympiad/Hero.java | 4 +- .../model/sevensigns/SevenSignsFestival.java | 4 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 6 +- .../siege/clanhalls/DevastatedCastle.java | 2 +- .../siege/clanhalls/FortressOfResistance.java | 2 +- .../clientpackets/MultiSellChoose.java | 2 +- .../clientpackets/RequestAquireSkill.java | 2 +- .../tasks/TaskRaidPointsReset.java | 2 +- .../Q508_AClansReputation.java | 2 +- .../Q509_TheClansPrestige.java | 2 +- .../Q510_AClansReputation.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 5 ++ .../gameserver/data/sql/ClanTable.java | 8 +++ .../admincommandhandlers/AdminPledge.java | 2 +- .../gameserver/model/actor/Player.java | 10 ++-- .../l2jmobius/gameserver/model/clan/Clan.java | 17 ++---- .../gameserver/model/olympiad/Hero.java | 4 +- .../model/sevensigns/SevenSignsFestival.java | 4 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 6 +- .../siege/clanhalls/DevastatedCastle.java | 2 +- .../siege/clanhalls/FortressOfResistance.java | 2 +- .../clientpackets/MultiSellChoose.java | 2 +- .../clientpackets/RequestAquireSkill.java | 2 +- .../tasks/TaskRaidPointsReset.java | 2 +- .../game/data/scripts/ai/others/Ballista.java | 2 +- .../ai/others/ClanTrader/ClanTrader.java | 2 +- .../ai/others/FameManager/FameManager.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../Q00508_AClansReputation.java | 2 +- .../Q00509_AClansFame/Q00509_AClansFame.java | 2 +- .../Q00510_AClansPrestige.java | 2 +- .../gameserver/data/sql/ClanTable.java | 2 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/model/actor/Player.java | 10 ++-- .../l2jmobius/gameserver/model/clan/Clan.java | 51 +++++------------ .../gameserver/model/olympiad/Hero.java | 2 +- .../model/sevensigns/SevenSignsFestival.java | 4 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../tasks/TaskRaidPointsReset.java | 2 +- .../game/data/scripts/ai/others/Ballista.java | 2 +- .../ai/others/ClanTrader/ClanTrader.java | 2 +- .../ai/others/FameManager/FameManager.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../Q00508_AClansReputation.java | 2 +- .../Q00509_AClansFame/Q00509_AClansFame.java | 2 +- .../Q00510_AClansPrestige.java | 2 +- .../gameserver/data/sql/ClanTable.java | 2 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/model/actor/Player.java | 10 ++-- .../l2jmobius/gameserver/model/clan/Clan.java | 51 +++++------------ .../gameserver/model/olympiad/Hero.java | 2 +- .../model/sevensigns/SevenSignsFestival.java | 4 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../tasks/TaskRaidPointsReset.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../gameserver/model/actor/Player.java | 6 +- .../model/actor/stat/PlayableStat.java | 2 +- .../l2jmobius/gameserver/model/clan/Clan.java | 43 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../gameserver/model/actor/Player.java | 6 +- .../model/actor/stat/PlayableStat.java | 2 +- .../l2jmobius/gameserver/model/clan/Clan.java | 43 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../gameserver/model/actor/Player.java | 6 +- .../model/actor/stat/PlayableStat.java | 2 +- .../l2jmobius/gameserver/model/clan/Clan.java | 43 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../gameserver/model/actor/Player.java | 6 +- .../model/actor/stat/PlayableStat.java | 2 +- .../l2jmobius/gameserver/model/clan/Clan.java | 43 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../gameserver/model/actor/Player.java | 6 +- .../model/actor/stat/PlayableStat.java | 2 +- .../l2jmobius/gameserver/model/clan/Clan.java | 43 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../gameserver/model/actor/Player.java | 6 +- .../model/actor/stat/PlayableStat.java | 2 +- .../l2jmobius/gameserver/model/clan/Clan.java | 43 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../gameserver/model/actor/Player.java | 6 +- .../model/actor/stat/PlayableStat.java | 2 +- .../l2jmobius/gameserver/model/clan/Clan.java | 43 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../gameserver/model/actor/Player.java | 6 +- .../model/actor/stat/PlayableStat.java | 2 +- .../l2jmobius/gameserver/model/clan/Clan.java | 43 +++----------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../gameserver/model/actor/Attackable.java | 2 +- .../gameserver/model/actor/Player.java | 6 +- .../model/actor/stat/PlayableStat.java | 2 +- .../l2jmobius/gameserver/model/clan/Clan.java | 56 +++++-------------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../pledgeV3/RequestExPledgeEnemyDelete.java | 2 +- .../RequestExPledgeDonationRequest.java | 6 +- .../admincommandhandlers/AdminPledge.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../gameserver/data/sql/ClanTable.java | 3 +- .../gameserver/model/actor/Attackable.java | 2 +- .../gameserver/model/actor/Player.java | 6 +- .../model/actor/stat/PlayableStat.java | 2 +- .../l2jmobius/gameserver/model/clan/Clan.java | 56 +++++-------------- .../gameserver/model/clan/ClanWar.java | 6 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/siege/Castle.java | 8 +-- .../gameserver/model/siege/Fort.java | 4 +- .../gameserver/model/skill/SkillCaster.java | 2 +- .../clientpackets/MultiSellChoose.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 4 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../pledgeV3/RequestExPledgeEnemyDelete.java | 2 +- .../RequestExPledgeDonationRequest.java | 6 +- 431 files changed, 969 insertions(+), 1505 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Ballista.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Ballista.java index 1336b58550..75d285a348 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Ballista.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Ballista.java @@ -75,7 +75,7 @@ public class Ballista extends AbstractNpcAI { if (npc.getFort().getSiege().isInProgress() && (caster.getClan() != null) && (caster.getClan().getLevel() >= MIN_CLAN_LV)) { - caster.getClan().addReputationScore(Config.BALLISTA_POINTS, true); + caster.getClan().addReputationScore(Config.BALLISTA_POINTS); caster.sendPacket(SystemMessageId.THE_BALLISTA_HAS_BEEN_SUCCESSFULLY_DESTROYED_THE_CLAN_REPUTATION_WILL_BE_INCREASED); } npc.doDie(caster); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java index 667721ad40..1d8e114daa 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java @@ -57,7 +57,7 @@ public class ClanTrader extends AbstractNpcAI if (getQuestItemsCount(player, itemId) >= itemCount) { takeItems(player, itemId, itemCount); - player.getClan().addReputationScore(count, true); + player.getClan().addReputationScore(count); final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_CLAN_HAS_ADDED_S1_POINT_S_TO_ITS_CLAN_REPUTATION); sm.addInt(count); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/FameManager/FameManager.java index f9d12e8679..e2dcf0ec59 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/FameManager/FameManager.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/FameManager/FameManager.java @@ -94,7 +94,7 @@ public class FameManager extends AbstractNpcAI if ((player.getFame() >= REPUTATION_COST) && (player.getLevel() >= MIN_LEVEL) && (player.getClassId().level() >= CLASS_LEVEL)) { player.setFame(player.getFame() - REPUTATION_COST); - player.getClan().addReputationScore(50, true); + player.getClan().addReputationScore(50); player.sendPacket(new UserInfo(player)); player.sendPacket(SystemMessageId.YOU_HAVE_ACQUIRED_50_CLAN_REPUTATION); htmltext = npc.getId() + "-04.html"; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java index 7588b315c7..cdd4d1e894 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java @@ -187,7 +187,7 @@ public class AdminPledge implements IAdminCommandHandler try { final int points = Integer.parseInt(param); - clan.addReputationScore(points, true); + clan.addReputationScore(points); BuilderUtil.sendSysMessage(activeChar, "You " + (points > 0 ? "add " : "remove ") + Math.abs(points) + " points " + (points > 0 ? "to " : "from ") + clan.getName() + "'s reputation. Their current score is " + clan.getReputationScore()); } catch (Exception e) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index e55914a26b..bd2f15869b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -52,7 +52,7 @@ public class GiveClanReputation extends AbstractEffect return; } - effector.getActingPlayer().getClan().addReputationScore(_reputation, true); + effector.getActingPlayer().getClan().addReputationScore(_reputation); for (ClanMember member : effector.getActingPlayer().getClan().getMembers()) { diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java index ba1cd932eb..cef8901dd4 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java @@ -183,7 +183,7 @@ public class Q00245_ComeToMe extends Quest { if (player.isAcademyMember()) { - player.getClan().addReputationScore(500, true); + player.getClan().addReputationScore(500); } addExpAndSp(player, 2_018_733, 484); giveItems(player, MENTOR_RING, 1); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java index 48718c5a89..1badd9d119 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java @@ -198,7 +198,7 @@ public class Q00508_AClansReputation extends Quest playSound(player, QuestSound.ITEMSOUND_QUEST_FANFARE_1); takeItems(player, REWARD_POINTS.get(raid).get(1), -1); final int rep = REWARD_POINTS.get(raid).get(2); - clan.addReputationScore(rep, true); + clan.addReputationScore(rep); player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_SUCCESSFULLY_COMPLETED_A_CLAN_QUEST_S1_POINT_S_HAVE_BEEN_ADDED_TO_YOUR_CLAN_REPUTATION).addInt(rep)); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java index 9be6ef2627..41dec6a58c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java @@ -180,7 +180,7 @@ public class Q00509_AClansFame extends Quest playSound(player, QuestSound.ITEMSOUND_QUEST_FANFARE_1); takeItems(player, REWARD_POINTS.get(raid).get(1), -1); final int rep = REWARD_POINTS.get(raid).get(2); - clan.addReputationScore(rep, true); + clan.addReputationScore(rep); player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_SUCCESSFULLY_COMPLETED_A_CLAN_QUEST_S1_POINT_S_HAVE_BEEN_ADDED_TO_YOUR_CLAN_REPUTATION).addInt(rep)); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java index 27567168aa..4a03ad47de 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java @@ -141,7 +141,7 @@ public class Q00510_AClansPrestige extends Quest final int reward = (count < 10) ? (30 * count) : (59 + (30 * count)); playSound(player, QuestSound.ITEMSOUND_QUEST_FANFARE_1); takeItems(player, TYRANNOSAURUS_CLAW, -1); - clan.addReputationScore(reward, true); + clan.addReputationScore(reward); player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_SUCCESSFULLY_COMPLETED_A_CLAN_QUEST_S1_POINT_S_HAVE_BEEN_ADDED_TO_YOUR_CLAN_REPUTATION).addInt(reward)); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); htmltext = "31331-7.html"; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 7288b65806..d7d900954c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -473,7 +473,8 @@ public class ClanTable { for (Clan clan : _clans.values()) { - clan.updateInDB(); + clan.updateClanInDB(); + clan.getVariables().storeMe(); for (ClanWar war : clan.getWarList().values()) { storeClanWars(war); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java index 5034107ebb..50cd7f47d0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2407,15 +2407,15 @@ public class Player extends Playable { if (_lvlJoinedAcademy <= 16) { - _clan.addReputationScore(Config.JOIN_ACADEMY_MAX_REP_SCORE, true); + _clan.addReputationScore(Config.JOIN_ACADEMY_MAX_REP_SCORE); } else if (_lvlJoinedAcademy >= 39) { - _clan.addReputationScore(Config.JOIN_ACADEMY_MIN_REP_SCORE, true); + _clan.addReputationScore(Config.JOIN_ACADEMY_MIN_REP_SCORE); } else { - _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((_lvlJoinedAcademy - 16) * 20)), true); + _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((_lvlJoinedAcademy - 16) * 20))); } setLvlJoinedAcademy(0); // oust pledge member from the academy, cuz he has finished his 2nd class transfer @@ -6752,7 +6752,7 @@ public class Player extends Playable final Clan clan = player.getClan(); if (clan != null) { - clan.addReputationScore(150000, true); + clan.addReputationScore(150000); } } player.setTrueHero(true); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java index 0dea5ff073..0d7ca01fc5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -945,28 +945,6 @@ public class Clan implements IIdentifiable, INamable } } - public void updateInDB() - { - // Update reputation - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET reputation_score=? WHERE clan_id=?")) - { - ps.setInt(1, _reputationScore); - ps.setInt(2, _clanId); - ps.execute(); - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); - } - - // Update variables at database - if (_vars != null) - { - _vars.storeMe(); - } - } - /** * Updates in database clan information: *