lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduced queries for storing clan values.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-12-17 22:11:27 +00:00
parent b25618c95c
commit c044fc0319
431 changed files with 969 additions and 1505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Ballista.java vendored
View File

@@ -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);

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java vendored
View File

@@ -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);

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/FameManager/FameManager.java vendored
View File

@@ -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";

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java vendored
View File

@@ -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)

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java vendored
View File

@@ -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())
{

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java vendored
View File

@@ -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);

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java vendored
View File

@@ -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));
}

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java vendored
View File

@@ -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));
}

2
L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java vendored
View File

@@ -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";

3
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
View File

@@ -477,7 +477,8 @@ public class ClanTable
{
for (Clan clan : _clans.values())
{
clan.updateInDB();
clan.updateClanInDB();
clan.getVariables().storeMe();
for (ClanWar war : clan.getWarList().values())
{
storeClanWars(war);

8
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -2411,15 +2411,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
@@ -6757,7 +6757,7 @@ public class Player extends Playable
final Clan clan = player.getClan();
if (clan != null)
{
clan.addReputationScore(150000, true);
clan.addReputationScore(150000);
}
}
player.setTrueHero(true);

55
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java
View File

@@ -946,28 +946,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:
* <ul>
@@ -1109,7 +1087,7 @@ public class Clan implements IIdentifiable, INamable
setCrestLargeId(clanData.getInt("crest_large_id"));
setAllyCrestId(clanData.getInt("ally_crest_id"));
setReputationScore(clanData.getInt("reputation_score"), false);
setReputationScore(clanData.getInt("reputation_score"));
setAuctionBiddedAt(clanData.getInt("auction_bid_at"), false);
setNewLeaderId(clanData.getInt("new_leader_id"), false);
@@ -1898,11 +1876,11 @@ public class Clan implements IIdentifiable, INamable
// Order of Knights 10000 points per each
if (pledgeType < SUBUNIT_KNIGHT1)
{
setReputationScore(_reputationScore - Config.ROYAL_GUARD_COST, true);
setReputationScore(_reputationScore - Config.ROYAL_GUARD_COST);
}
else
{
setReputationScore(_reputationScore - Config.KNIGHT_UNIT_COST, true);
setReputationScore(_reputationScore - Config.KNIGHT_UNIT_COST);
// TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST
}
}
@@ -2102,17 +2080,17 @@ public class Clan implements IIdentifiable, INamable
return id;
}
public synchronized void addReputationScore(int value, boolean save)
public synchronized void addReputationScore(int value)
{
setReputationScore(_reputationScore + value, save);
setReputationScore(_reputationScore + value);
}
public synchronized void takeReputationScore(int value, boolean save)
public synchronized void takeReputationScore(int value)
{
setReputationScore(_reputationScore - value, save);
setReputationScore(_reputationScore - value);
}
private void setReputationScore(int value, boolean save)
private void setReputationScore(int value)
{
if ((_reputationScore >= 0) && (value < 0))
{
@@ -2146,11 +2124,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
if (save)
{
updateInDB();
}
}
public int getReputationScore()
@@ -2604,7 +2579,7 @@ public class Clan implements IIdentifiable, INamable
// Upgrade to 6
if ((_reputationScore >= Config.CLAN_LEVEL_6_COST) && (_members.size() >= Config.CLAN_LEVEL_6_REQUIREMENT))
{
setReputationScore(_reputationScore - Config.CLAN_LEVEL_6_COST, true);
setReputationScore(_reputationScore - Config.CLAN_LEVEL_6_COST);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(Config.CLAN_LEVEL_6_COST);
player.sendPacket(cr);
@@ -2617,7 +2592,7 @@ public class Clan implements IIdentifiable, INamable
// Upgrade to 7
if ((_reputationScore >= Config.CLAN_LEVEL_7_COST) && (_members.size() >= Config.CLAN_LEVEL_7_REQUIREMENT))
{
setReputationScore(_reputationScore - Config.CLAN_LEVEL_7_COST, true);
setReputationScore(_reputationScore - Config.CLAN_LEVEL_7_COST);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(Config.CLAN_LEVEL_7_COST);
player.sendPacket(cr);
@@ -2630,7 +2605,7 @@ public class Clan implements IIdentifiable, INamable
// Upgrade to 8
if ((_reputationScore >= Config.CLAN_LEVEL_8_COST) && (_members.size() >= Config.CLAN_LEVEL_8_REQUIREMENT))
{
setReputationScore(_reputationScore - Config.CLAN_LEVEL_8_COST, true);
setReputationScore(_reputationScore - Config.CLAN_LEVEL_8_COST);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(Config.CLAN_LEVEL_8_COST);
player.sendPacket(cr);
@@ -2646,7 +2621,7 @@ public class Clan implements IIdentifiable, INamable
// itemId 9910 == Blood Oath
if (player.destroyItemByItemId("ClanLvl", 9910, 150, player.getTarget(), false))
{
setReputationScore(_reputationScore - Config.CLAN_LEVEL_9_COST, true);
setReputationScore(_reputationScore - Config.CLAN_LEVEL_9_COST);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(Config.CLAN_LEVEL_9_COST);
player.sendPacket(cr);
@@ -2667,7 +2642,7 @@ public class Clan implements IIdentifiable, INamable
// itemId 9911 == Blood Alliance
if (player.destroyItemByItemId("ClanLvl", 9911, 5, player.getTarget(), false))
{
setReputationScore(_reputationScore - Config.CLAN_LEVEL_10_COST, true);
setReputationScore(_reputationScore - Config.CLAN_LEVEL_10_COST);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(Config.CLAN_LEVEL_10_COST);
player.sendPacket(cr);
@@ -2685,7 +2660,7 @@ public class Clan implements IIdentifiable, INamable
// Upgrade to 11
if ((_reputationScore >= Config.CLAN_LEVEL_11_COST) && (_members.size() >= Config.CLAN_LEVEL_11_REQUIREMENT))
{
setReputationScore(_reputationScore - Config.CLAN_LEVEL_11_COST, true);
setReputationScore(_reputationScore - Config.CLAN_LEVEL_11_COST);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(Config.CLAN_LEVEL_11_COST);
player.sendPacket(cr);

6
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
View File

@@ -110,8 +110,8 @@ public class ClanWar
// however, when the other side reputation score is 0 or below, your clan cannot acquire any reputation points from them.
if (victimClan.getReputationScore() > 0)
{
victimClan.takeReputationScore(Config.REPUTATION_SCORE_PER_KILL, false);
killerClan.addReputationScore(Config.REPUTATION_SCORE_PER_KILL, false);
victimClan.takeReputationScore(Config.REPUTATION_SCORE_PER_KILL);
killerClan.addReputationScore(Config.REPUTATION_SCORE_PER_KILL);
}
// System Message notification to clan members
@@ -167,7 +167,7 @@ public class ClanWar
final Clan winnerClan = cancelor.getId() == _attackerClanId ? ClanTable.getInstance().getClan(_attackedClanId) : ClanTable.getInstance().getClan(_attackerClanId);
// Reduce reputation.
cancelor.takeReputationScore(5000, true);
cancelor.takeReputationScore(5000);
player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
SystemMessage sm = new SystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
sm.addString(winnerClan.getName());

2
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
View File

@@ -906,7 +906,7 @@ public class Hero
final Clan clan = player.getClan();
if ((clan != null) && (clan.getLevel() >= 5))
{
clan.addReputationScore(Config.HERO_POINTS, true);
clan.addReputationScore(Config.HERO_POINTS);
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_C1_WAS_NAMED_A_HERO_S2_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_REPUTATION);
sm.addString(CharNameTable.getInstance().getNameById(player.getObjectId()));
sm.addInt(Config.HERO_POINTS);

8
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Castle.java
View File

@@ -1014,16 +1014,16 @@ public class Castle extends AbstractResidence
if (_formerOwner != ClanTable.getInstance().getClan(getOwnerId()))
{
final int maxreward = Math.max(0, _formerOwner.getReputationScore());
_formerOwner.takeReputationScore(Config.LOOSE_CASTLE_POINTS, true);
_formerOwner.takeReputationScore(Config.LOOSE_CASTLE_POINTS);
final Clan owner = ClanTable.getInstance().getClan(getOwnerId());
if (owner != null)
{
owner.addReputationScore(Math.min(Config.TAKE_CASTLE_POINTS, maxreward), true);
owner.addReputationScore(Math.min(Config.TAKE_CASTLE_POINTS, maxreward));
}
}
else
{
_formerOwner.addReputationScore(Config.CASTLE_DEFENDED_POINTS, true);
_formerOwner.addReputationScore(Config.CASTLE_DEFENDED_POINTS);
}
}
else
@@ -1031,7 +1031,7 @@ public class Castle extends AbstractResidence
final Clan owner = ClanTable.getInstance().getClan(getOwnerId());
if (owner != null)
{
owner.addReputationScore(Config.TAKE_CASTLE_POINTS, true);
owner.addReputationScore(Config.TAKE_CASTLE_POINTS);
}
}
}

4
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java
View File

@@ -939,11 +939,11 @@ public class Fort extends AbstractResidence
{
if (removePoints)
{
owner.takeReputationScore(Config.LOOSE_FORT_POINTS, true);
owner.takeReputationScore(Config.LOOSE_FORT_POINTS);
}
else
{
owner.addReputationScore(Config.TAKE_FORT_POINTS, true);
owner.addReputationScore(Config.TAKE_FORT_POINTS);
}
}
}

2
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
View File

@@ -391,7 +391,7 @@ public class SkillCaster implements Runnable
player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_IS_TOO_LOW);
return false;
}
clan.takeReputationScore(_skill.getClanRepConsume(), true);
clan.takeReputationScore(_skill.getClanRepConsume());
final SystemMessage msg = new SystemMessage(SystemMessageId.S1_CLAN_REPUTATION_HAS_BEEN_CONSUMED);
msg.addInt(_skill.getClanRepConsume());

4
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@@ -340,7 +340,7 @@ public class MultiSellChoose implements IClientIncomingPacket
{
if (clan != null)
{
clan.takeReputationScore((int) totalCount, true);
clan.takeReputationScore((int) totalCount);
final SystemMessage smsg = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
smsg.addLong(totalCount);
player.sendPacket(smsg);
@@ -460,7 +460,7 @@ public class MultiSellChoose implements IClientIncomingPacket
{
if (clan != null)
{
clan.addReputationScore((int) totalCount, true);
clan.addReputationScore((int) totalCount);
}
break;
}

4
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -212,7 +212,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
}
}
clan.takeReputationScore(repCost, true);
clan.takeReputationScore(repCost);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(repCost);
@@ -275,7 +275,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (repCost > 0)
{
clan.takeReputationScore(repCost, true);
clan.takeReputationScore(repCost);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(repCost);
player.sendPacket(cr);

2
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -88,7 +88,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket
}
// Reduce reputation.
playerClan.takeReputationScore(5000, true);
playerClan.takeReputationScore(5000);
ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (Player member : playerClan.getOnlineMembers(0))
{