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:
*
@@ -1108,7 +1086,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);
@@ -1897,11 +1875,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
}
}
@@ -2101,17 +2079,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))
{
@@ -2145,11 +2123,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
@@ -2603,7 +2578,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);
@@ -2616,7 +2591,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);
@@ -2629,7 +2604,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);
@@ -2645,7 +2620,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);
@@ -2666,7 +2641,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);
@@ -2684,7 +2659,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);
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 088e6515d6..c644a4b44f 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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());
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 6a10ea1945..1646a08d02 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -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);
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 88e6265173..0937e6d16d 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 11144160b5..94f594e4e5 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 444a3f3b3c..df031f1a8f 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -312,7 +312,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);
@@ -432,7 +432,7 @@ public class MultiSellChoose implements IClientIncomingPacket
{
if (clan != null)
{
- clan.addReputationScore((int) totalCount, true);
+ clan.addReputationScore((int) totalCount);
}
break;
}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index c9ac9e3d84..2c40256569 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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);
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index cee42b27c3..1d140aceb8 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -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))
{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Ballista.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Ballista.java
index 1336b58550..75d285a348 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Ballista.java
+++ b/L2J_Mobius_02.5_Underground/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_02.5_Underground/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 667721ad40..1d8e114daa 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_02.5_Underground/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_02.5_Underground/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index f9d12e8679..e2dcf0ec59 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_02.5_Underground/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_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 7588b315c7..cdd4d1e894 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_02.5_Underground/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_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_02.5_Underground/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_02.5_Underground/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
index ba1cd932eb..cef8901dd4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
+++ b/L2J_Mobius_02.5_Underground/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_02.5_Underground/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 48718c5a89..1badd9d119 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_Mobius_02.5_Underground/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_02.5_Underground/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index 9be6ef2627..41dec6a58c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_Mobius_02.5_Underground/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_02.5_Underground/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index 27567168aa..4a03ad47de 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_Mobius_02.5_Underground/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_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 7288b65806..d7d900954c 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_02.5_Underground/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_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
index d867b444e0..ec9c7bbe7f 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2409,15 +2409,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
@@ -6755,7 +6755,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_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java
index aedb2e7c95..21d61426aa 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -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:
*
@@ -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);
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 088e6515d6..c644a4b44f 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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());
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 6a10ea1945..1646a08d02 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -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);
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 88e6265173..0937e6d16d 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 43d4da139d..2feccc7d5e 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 6a26d8fec9..4be5cd095a 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 951d019212..0826beb55c 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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);
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index cee42b27c3..1d140aceb8 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -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))
{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Ballista.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Ballista.java
index 1336b58550..75d285a348 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Ballista.java
+++ b/L2J_Mobius_03.0_Helios/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_03.0_Helios/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 667721ad40..1d8e114daa 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_03.0_Helios/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_03.0_Helios/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index f9d12e8679..e2dcf0ec59 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_03.0_Helios/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_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 7588b315c7..cdd4d1e894 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_03.0_Helios/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_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_03.0_Helios/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_03.0_Helios/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
index ba1cd932eb..cef8901dd4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
+++ b/L2J_Mobius_03.0_Helios/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_03.0_Helios/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 48718c5a89..1badd9d119 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_Mobius_03.0_Helios/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_03.0_Helios/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index 9be6ef2627..41dec6a58c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_Mobius_03.0_Helios/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_03.0_Helios/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index 27567168aa..4a03ad47de 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_Mobius_03.0_Helios/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_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 57182a418f..ff17f694f3 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
index 6504c9e255..4c3c98215d 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -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);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java
index aedb2e7c95..21d61426aa 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -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:
*
@@ -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);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 088e6515d6..c644a4b44f 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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());
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 6a10ea1945..1646a08d02 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -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);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 88e6265173..0937e6d16d 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 43d4da139d..2feccc7d5e 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 6a26d8fec9..4be5cd095a 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 951d019212..0826beb55c 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index cee42b27c3..1d140aceb8 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -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))
{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Ballista.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Ballista.java
index 1336b58550..75d285a348 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Ballista.java
+++ b/L2J_Mobius_04.0_GrandCrusade/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_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 667721ad40..1d8e114daa 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_04.0_GrandCrusade/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_04.0_GrandCrusade/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index f9d12e8679..e2dcf0ec59 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/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_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 7588b315c7..cdd4d1e894 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_04.0_GrandCrusade/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_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/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_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
index ba1cd932eb..cef8901dd4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
+++ b/L2J_Mobius_04.0_GrandCrusade/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_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 48718c5a89..1badd9d119 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/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_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index 9be6ef2627..41dec6a58c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_Mobius_04.0_GrandCrusade/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_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index 27567168aa..4a03ad47de 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_Mobius_04.0_GrandCrusade/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_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 60b983fb0f..3ce3716f0e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
index 791a09f755..3253c5f338 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2419,15 +2419,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_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java
index aedb2e7c95..21d61426aa 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -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:
*
@@ -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);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 088e6515d6..c644a4b44f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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());
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 6a10ea1945..1646a08d02 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -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);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 88e6265173..0937e6d16d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 43d4da139d..2feccc7d5e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 6a26d8fec9..4be5cd095a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 951d019212..0826beb55c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index cee42b27c3..1d140aceb8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -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))
{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Ballista.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Ballista.java
index 1336b58550..75d285a348 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Ballista.java
+++ b/L2J_Mobius_05.0_Salvation/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_05.0_Salvation/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 667721ad40..1d8e114daa 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_05.0_Salvation/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_05.0_Salvation/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index f9d12e8679..e2dcf0ec59 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_05.0_Salvation/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_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index a84fcca7c1..c33a716507 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_05.0_Salvation/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_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_05.0_Salvation/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_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 60b983fb0f..3ce3716f0e 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
index 0ba21bfb04..7b8cb97fa5 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
@@ -141,7 +141,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
{
if (reward.getId() == SpecialItemType.CLAN_REPUTATION.getClientId())
{
- player.getClan().addReputationScore((int) reward.getCount(), true);
+ player.getClan().addReputationScore((int) reward.getCount());
}
else if (reward.getId() == SpecialItemType.FAME.getClientId())
{
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
index 84f45c922e..3df2479a3a 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2448,15 +2448,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
@@ -6769,7 +6769,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_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 4cbda1f59e..823f20e28a 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -860,28 +860,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:
*
@@ -1030,7 +1008,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);
@@ -1953,17 +1931,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))
{
@@ -1997,11 +1975,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
@@ -2349,7 +2324,7 @@ public class Clan implements IIdentifiable, INamable
final int requiredReputation = ClanLevelData.getLevelRequirement(_level);
if (requiredReputation <= _reputationScore)
{
- setReputationScore(_reputationScore - requiredReputation, true);
+ setReputationScore(_reputationScore - requiredReputation);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(requiredReputation);
player.sendPacket(cr);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 061776166b..99ae98fd85 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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());
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 6a10ea1945..1646a08d02 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -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);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Castle.java
index f86639cf04..aafd4832a2 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index ba5a8c620a..3c999b4973 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index d2ae26c63b..25f2ad84f3 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 3ce36782c8..59d0be8196 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -225,7 +225,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);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index cee42b27c3..1d140aceb8 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -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))
{
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
index 071a7164e4..0083cf8686 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
@@ -61,7 +61,7 @@ public class RequestExPledgeMasteryReset implements IClientIncomingPacket
return;
}
- clan.takeReputationScore(REPUTATION_COST, true);
+ clan.takeReputationScore(REPUTATION_COST);
clan.removeAllMasteries();
clan.setDevelopmentPoints(0);
player.sendPacket(new ExPledgeMasteryInfo(player));
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
index 2818f986ef..704be59be0 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
@@ -100,7 +100,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket
}
// Learn.
- clan.takeReputationScore(mastery.getClanReputation(), true);
+ clan.takeReputationScore(mastery.getClanReputation());
clan.addMastery(mastery.getId());
clan.setDevelopmentPoints(clan.getUsedDevelopmentPoints() + 1);
for (Skill skill : mastery.getSkills())
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
index 7b6e6a7218..1723a0c945 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
@@ -111,7 +111,7 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
}
// Learn.
- clan.takeReputationScore(cost, true);
+ clan.takeReputationScore(cost);
clan.addMasterySkill(_skillId);
player.sendPacket(new ExPledgeSkillInfo(_skillId, 1, 1296000, 2));
}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Ballista.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Ballista.java
index 1336b58550..75d285a348 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Ballista.java
+++ b/L2J_Mobius_05.5_EtinasFate/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_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 667721ad40..1d8e114daa 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_05.5_EtinasFate/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_05.5_EtinasFate/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index f9d12e8679..e2dcf0ec59 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/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_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index a84fcca7c1..c33a716507 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_05.5_EtinasFate/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_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_05.5_EtinasFate/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_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 60b983fb0f..3ce3716f0e 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
index 0ba21bfb04..7b8cb97fa5 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
@@ -141,7 +141,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
{
if (reward.getId() == SpecialItemType.CLAN_REPUTATION.getClientId())
{
- player.getClan().addReputationScore((int) reward.getCount(), true);
+ player.getClan().addReputationScore((int) reward.getCount());
}
else if (reward.getId() == SpecialItemType.FAME.getClientId())
{
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
index a19db5462c..a4edd25107 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2448,15 +2448,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
@@ -6769,7 +6769,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_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 4cbda1f59e..823f20e28a 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -860,28 +860,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:
*
@@ -1030,7 +1008,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);
@@ -1953,17 +1931,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))
{
@@ -1997,11 +1975,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
@@ -2349,7 +2324,7 @@ public class Clan implements IIdentifiable, INamable
final int requiredReputation = ClanLevelData.getLevelRequirement(_level);
if (requiredReputation <= _reputationScore)
{
- setReputationScore(_reputationScore - requiredReputation, true);
+ setReputationScore(_reputationScore - requiredReputation);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(requiredReputation);
player.sendPacket(cr);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index ac52ca0171..4e8db32a55 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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());
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index b9991074a2..2eb72eef2a 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -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);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Castle.java
index f86639cf04..aafd4832a2 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index ba5a8c620a..3c999b4973 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index d2ae26c63b..25f2ad84f3 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index e4a56f0f63..90f86dff97 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -225,7 +225,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);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index cee42b27c3..1d140aceb8 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -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))
{
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
index 071a7164e4..0083cf8686 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
@@ -61,7 +61,7 @@ public class RequestExPledgeMasteryReset implements IClientIncomingPacket
return;
}
- clan.takeReputationScore(REPUTATION_COST, true);
+ clan.takeReputationScore(REPUTATION_COST);
clan.removeAllMasteries();
clan.setDevelopmentPoints(0);
player.sendPacket(new ExPledgeMasteryInfo(player));
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
index 2818f986ef..704be59be0 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
@@ -100,7 +100,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket
}
// Learn.
- clan.takeReputationScore(mastery.getClanReputation(), true);
+ clan.takeReputationScore(mastery.getClanReputation());
clan.addMastery(mastery.getId());
clan.setDevelopmentPoints(clan.getUsedDevelopmentPoints() + 1);
for (Skill skill : mastery.getSkills())
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
index 7b6e6a7218..1723a0c945 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
@@ -111,7 +111,7 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
}
// Learn.
- clan.takeReputationScore(cost, true);
+ clan.takeReputationScore(cost);
clan.addMasterySkill(_skillId);
player.sendPacket(new ExPledgeSkillInfo(_skillId, 1, 1296000, 2));
}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Ballista.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Ballista.java
index 1336b58550..75d285a348 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Ballista.java
+++ b/L2J_Mobius_06.0_Fafurion/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_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 667721ad40..1d8e114daa 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_06.0_Fafurion/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_06.0_Fafurion/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index f9d12e8679..e2dcf0ec59 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_06.0_Fafurion/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_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index a84fcca7c1..c33a716507 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_06.0_Fafurion/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_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_06.0_Fafurion/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_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 60b983fb0f..3ce3716f0e 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
index 0ba21bfb04..7b8cb97fa5 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
@@ -141,7 +141,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
{
if (reward.getId() == SpecialItemType.CLAN_REPUTATION.getClientId())
{
- player.getClan().addReputationScore((int) reward.getCount(), true);
+ player.getClan().addReputationScore((int) reward.getCount());
}
else if (reward.getId() == SpecialItemType.FAME.getClientId())
{
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
index 74eb6e916c..6068da0d07 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2448,15 +2448,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
@@ -6770,7 +6770,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_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 4cbda1f59e..823f20e28a 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -860,28 +860,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:
*
@@ -1030,7 +1008,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);
@@ -1953,17 +1931,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))
{
@@ -1997,11 +1975,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
@@ -2349,7 +2324,7 @@ public class Clan implements IIdentifiable, INamable
final int requiredReputation = ClanLevelData.getLevelRequirement(_level);
if (requiredReputation <= _reputationScore)
{
- setReputationScore(_reputationScore - requiredReputation, true);
+ setReputationScore(_reputationScore - requiredReputation);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(requiredReputation);
player.sendPacket(cr);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index ac52ca0171..4e8db32a55 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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());
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index b9991074a2..2eb72eef2a 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -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);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Castle.java
index f86639cf04..aafd4832a2 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index ba5a8c620a..3c999b4973 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index d2ae26c63b..25f2ad84f3 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index e4a56f0f63..90f86dff97 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -225,7 +225,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);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index cee42b27c3..1d140aceb8 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -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))
{
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
index 071a7164e4..0083cf8686 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
@@ -61,7 +61,7 @@ public class RequestExPledgeMasteryReset implements IClientIncomingPacket
return;
}
- clan.takeReputationScore(REPUTATION_COST, true);
+ clan.takeReputationScore(REPUTATION_COST);
clan.removeAllMasteries();
clan.setDevelopmentPoints(0);
player.sendPacket(new ExPledgeMasteryInfo(player));
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
index 2818f986ef..704be59be0 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
@@ -100,7 +100,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket
}
// Learn.
- clan.takeReputationScore(mastery.getClanReputation(), true);
+ clan.takeReputationScore(mastery.getClanReputation());
clan.addMastery(mastery.getId());
clan.setDevelopmentPoints(clan.getUsedDevelopmentPoints() + 1);
for (Skill skill : mastery.getSkills())
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
index 7b6e6a7218..1723a0c945 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
@@ -111,7 +111,7 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
}
// Learn.
- clan.takeReputationScore(cost, true);
+ clan.takeReputationScore(cost);
clan.addMasterySkill(_skillId);
player.sendPacket(new ExPledgeSkillInfo(_skillId, 1, 1296000, 2));
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Ballista.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Ballista.java
index 1336b58550..75d285a348 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Ballista.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/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_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 667721ad40..1d8e114daa 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/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_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index f9d12e8679..e2dcf0ec59 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/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_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index a84fcca7c1..c33a716507 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/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_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/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_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 60b983fb0f..3ce3716f0e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
index 0ba21bfb04..7b8cb97fa5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
@@ -141,7 +141,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
{
if (reward.getId() == SpecialItemType.CLAN_REPUTATION.getClientId())
{
- player.getClan().addReputationScore((int) reward.getCount(), true);
+ player.getClan().addReputationScore((int) reward.getCount());
}
else if (reward.getId() == SpecialItemType.FAME.getClientId())
{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
index 6319df27f3..9df4fda479 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2384,15 +2384,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
@@ -6734,7 +6734,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_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 11befef821..7e1efc58cb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -859,28 +859,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:
*
@@ -1029,7 +1007,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);
@@ -1952,17 +1930,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))
{
@@ -1996,11 +1974,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
@@ -2348,7 +2323,7 @@ public class Clan implements IIdentifiable, INamable
final int requiredReputation = ClanLevelData.getLevelRequirement(_level);
if (requiredReputation <= _reputationScore)
{
- setReputationScore(_reputationScore - requiredReputation, true);
+ setReputationScore(_reputationScore - requiredReputation);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(requiredReputation);
player.sendPacket(cr);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index d0625d981c..074ac313ff 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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());
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index b98f055fe3..be9e88c11d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -931,7 +931,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);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Castle.java
index f86639cf04..aafd4832a2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 2b97b2e6b3..05401f1427 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 91a2b46047..5d3c284100 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 0c9ba62406..f089d00223 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -225,7 +225,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);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index cee42b27c3..1d140aceb8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -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))
{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
index 071a7164e4..0083cf8686 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
@@ -61,7 +61,7 @@ public class RequestExPledgeMasteryReset implements IClientIncomingPacket
return;
}
- clan.takeReputationScore(REPUTATION_COST, true);
+ clan.takeReputationScore(REPUTATION_COST);
clan.removeAllMasteries();
clan.setDevelopmentPoints(0);
player.sendPacket(new ExPledgeMasteryInfo(player));
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
index 2818f986ef..704be59be0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
@@ -100,7 +100,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket
}
// Learn.
- clan.takeReputationScore(mastery.getClanReputation(), true);
+ clan.takeReputationScore(mastery.getClanReputation());
clan.addMastery(mastery.getId());
clan.setDevelopmentPoints(clan.getUsedDevelopmentPoints() + 1);
for (Skill skill : mastery.getSkills())
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
index 7b6e6a7218..1723a0c945 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
@@ -111,7 +111,7 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
}
// Learn.
- clan.takeReputationScore(cost, true);
+ clan.takeReputationScore(cost);
clan.addMasterySkill(_skillId);
player.sendPacket(new ExPledgeSkillInfo(_skillId, 1, 1296000, 2));
}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Ballista.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Ballista.java
index 1336b58550..75d285a348 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Ballista.java
+++ b/L2J_Mobius_08.2_Homunculus/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_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 667721ad40..1d8e114daa 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_08.2_Homunculus/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_08.2_Homunculus/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index f9d12e8679..e2dcf0ec59 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_08.2_Homunculus/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_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index a84fcca7c1..c33a716507 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_08.2_Homunculus/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_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_08.2_Homunculus/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_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 60b983fb0f..3ce3716f0e 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
index 0ba21bfb04..7b8cb97fa5 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
@@ -141,7 +141,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
{
if (reward.getId() == SpecialItemType.CLAN_REPUTATION.getClientId())
{
- player.getClan().addReputationScore((int) reward.getCount(), true);
+ player.getClan().addReputationScore((int) reward.getCount());
}
else if (reward.getId() == SpecialItemType.FAME.getClientId())
{
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
index 18e2a483d0..d6e1357db4 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2414,15 +2414,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
@@ -6831,7 +6831,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_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 11befef821..7e1efc58cb 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -859,28 +859,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:
*
@@ -1029,7 +1007,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);
@@ -1952,17 +1930,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))
{
@@ -1996,11 +1974,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
@@ -2348,7 +2323,7 @@ public class Clan implements IIdentifiable, INamable
final int requiredReputation = ClanLevelData.getLevelRequirement(_level);
if (requiredReputation <= _reputationScore)
{
- setReputationScore(_reputationScore - requiredReputation, true);
+ setReputationScore(_reputationScore - requiredReputation);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(requiredReputation);
player.sendPacket(cr);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index d0625d981c..074ac313ff 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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());
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index b98f055fe3..be9e88c11d 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -931,7 +931,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);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Castle.java
index f86639cf04..aafd4832a2 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 2b97b2e6b3..05401f1427 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 91a2b46047..5d3c284100 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 0c9ba62406..f089d00223 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -225,7 +225,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);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index cee42b27c3..1d140aceb8 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -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))
{
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
index 071a7164e4..0083cf8686 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
@@ -61,7 +61,7 @@ public class RequestExPledgeMasteryReset implements IClientIncomingPacket
return;
}
- clan.takeReputationScore(REPUTATION_COST, true);
+ clan.takeReputationScore(REPUTATION_COST);
clan.removeAllMasteries();
clan.setDevelopmentPoints(0);
player.sendPacket(new ExPledgeMasteryInfo(player));
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
index 2818f986ef..704be59be0 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
@@ -100,7 +100,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket
}
// Learn.
- clan.takeReputationScore(mastery.getClanReputation(), true);
+ clan.takeReputationScore(mastery.getClanReputation());
clan.addMastery(mastery.getId());
clan.setDevelopmentPoints(clan.getUsedDevelopmentPoints() + 1);
for (Skill skill : mastery.getSkills())
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
index 7b6e6a7218..1723a0c945 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
@@ -111,7 +111,7 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
}
// Learn.
- clan.takeReputationScore(cost, true);
+ clan.takeReputationScore(cost);
clan.addMasterySkill(_skillId);
player.sendPacket(new ExPledgeSkillInfo(_skillId, 1, 1296000, 2));
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Ballista.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Ballista.java
index 1336b58550..75d285a348 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Ballista.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 667721ad40..1d8e114daa 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index f9d12e8679..e2dcf0ec59 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index a84fcca7c1..c33a716507 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 60b983fb0f..3ce3716f0e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
index 0ba21bfb04..7b8cb97fa5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
@@ -141,7 +141,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
{
if (reward.getId() == SpecialItemType.CLAN_REPUTATION.getClientId())
{
- player.getClan().addReputationScore((int) reward.getCount(), true);
+ player.getClan().addReputationScore((int) reward.getCount());
}
else if (reward.getId() == SpecialItemType.FAME.getClientId())
{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
index 9822b99dc4..2edc328002 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2431,15 +2431,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
@@ -6848,7 +6848,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_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 11befef821..7e1efc58cb 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -859,28 +859,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:
*
@@ -1029,7 +1007,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);
@@ -1952,17 +1930,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))
{
@@ -1996,11 +1974,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
@@ -2348,7 +2323,7 @@ public class Clan implements IIdentifiable, INamable
final int requiredReputation = ClanLevelData.getLevelRequirement(_level);
if (requiredReputation <= _reputationScore)
{
- setReputationScore(_reputationScore - requiredReputation, true);
+ setReputationScore(_reputationScore - requiredReputation);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(requiredReputation);
player.sendPacket(cr);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index d0625d981c..074ac313ff 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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());
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index b98f055fe3..be9e88c11d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -931,7 +931,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);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Castle.java
index f86639cf04..aafd4832a2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 219b09359e..754b3b8a8a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 3b9960aef4..3a5830bf03 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -339,7 +339,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);
@@ -464,7 +464,7 @@ public class MultiSellChoose implements IClientIncomingPacket
{
if (clan != null)
{
- clan.addReputationScore((int) totalCount, true);
+ clan.addReputationScore((int) totalCount);
}
break;
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 0c9ba62406..f089d00223 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -225,7 +225,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);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index cee42b27c3..1d140aceb8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -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))
{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
index 071a7164e4..0083cf8686 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
@@ -61,7 +61,7 @@ public class RequestExPledgeMasteryReset implements IClientIncomingPacket
return;
}
- clan.takeReputationScore(REPUTATION_COST, true);
+ clan.takeReputationScore(REPUTATION_COST);
clan.removeAllMasteries();
clan.setDevelopmentPoints(0);
player.sendPacket(new ExPledgeMasteryInfo(player));
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
index 2818f986ef..704be59be0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
@@ -100,7 +100,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket
}
// Learn.
- clan.takeReputationScore(mastery.getClanReputation(), true);
+ clan.takeReputationScore(mastery.getClanReputation());
clan.addMastery(mastery.getId());
clan.setDevelopmentPoints(clan.getUsedDevelopmentPoints() + 1);
for (Skill skill : mastery.getSkills())
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
index 7b6e6a7218..1723a0c945 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
@@ -111,7 +111,7 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
}
// Learn.
- clan.takeReputationScore(cost, true);
+ clan.takeReputationScore(cost);
clan.addMasterySkill(_skillId);
player.sendPacket(new ExPledgeSkillInfo(_skillId, 1, 1296000, 2));
}
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/Ballista.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/Ballista.java
index 1336b58550..75d285a348 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/Ballista.java
+++ b/L2J_Mobius_10.0_MasterClass/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_10.0_MasterClass/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 667721ad40..1d8e114daa 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_10.0_MasterClass/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_10.0_MasterClass/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index f9d12e8679..e2dcf0ec59 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_10.0_MasterClass/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_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index a84fcca7c1..c33a716507 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_10.0_MasterClass/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_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_10.0_MasterClass/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_10.0_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 60b983fb0f..3ce3716f0e 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
index 0ba21bfb04..7b8cb97fa5 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
@@ -141,7 +141,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
{
if (reward.getId() == SpecialItemType.CLAN_REPUTATION.getClientId())
{
- player.getClan().addReputationScore((int) reward.getCount(), true);
+ player.getClan().addReputationScore((int) reward.getCount());
}
else if (reward.getId() == SpecialItemType.FAME.getClientId())
{
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
index b073a8f824..77b3e691ac 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2433,15 +2433,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
@@ -6885,7 +6885,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_10.0_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 11befef821..7e1efc58cb 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -859,28 +859,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:
*
@@ -1029,7 +1007,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);
@@ -1952,17 +1930,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))
{
@@ -1996,11 +1974,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
@@ -2348,7 +2323,7 @@ public class Clan implements IIdentifiable, INamable
final int requiredReputation = ClanLevelData.getLevelRequirement(_level);
if (requiredReputation <= _reputationScore)
{
- setReputationScore(_reputationScore - requiredReputation, true);
+ setReputationScore(_reputationScore - requiredReputation);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION);
cr.addInt(requiredReputation);
player.sendPacket(cr);
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index d0625d981c..074ac313ff 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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());
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index b98f055fe3..be9e88c11d 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -931,7 +931,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);
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Castle.java
index f86639cf04..aafd4832a2 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 2b97b2e6b3..05401f1427 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 3b9960aef4..3a5830bf03 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -339,7 +339,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);
@@ -464,7 +464,7 @@ public class MultiSellChoose implements IClientIncomingPacket
{
if (clan != null)
{
- clan.addReputationScore((int) totalCount, true);
+ clan.addReputationScore((int) totalCount);
}
break;
}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 0c9ba62406..f089d00223 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -225,7 +225,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);
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index cee42b27c3..1d140aceb8 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -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))
{
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
index 071a7164e4..0083cf8686 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java
@@ -61,7 +61,7 @@ public class RequestExPledgeMasteryReset implements IClientIncomingPacket
return;
}
- clan.takeReputationScore(REPUTATION_COST, true);
+ clan.takeReputationScore(REPUTATION_COST);
clan.removeAllMasteries();
clan.setDevelopmentPoints(0);
player.sendPacket(new ExPledgeMasteryInfo(player));
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
index 2818f986ef..704be59be0 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java
@@ -100,7 +100,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket
}
// Learn.
- clan.takeReputationScore(mastery.getClanReputation(), true);
+ clan.takeReputationScore(mastery.getClanReputation());
clan.addMastery(mastery.getId());
clan.setDevelopmentPoints(clan.getUsedDevelopmentPoints() + 1);
for (Skill skill : mastery.getSkills())
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
index 7b6e6a7218..1723a0c945 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
@@ -111,7 +111,7 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
}
// Learn.
- clan.takeReputationScore(cost, true);
+ clan.takeReputationScore(cost);
clan.addMasterySkill(_skillId);
player.sendPacket(new ExPledgeSkillInfo(_skillId, 1, 1296000, 2));
}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java
index d14976fb6f..4ed540b815 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/Shutdown.java
@@ -24,6 +24,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.SchemeBufferTable;
import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
+import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.data.sql.OfflineTraderTable;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
@@ -445,6 +446,10 @@ public class Shutdown extends Thread
GrandBossManager.getInstance().cleanUp();
LOGGER.info("GrandBossManager: All Grand Boss info saved!!");
+ // Save clan data.
+ ClanTable.getInstance().shutdown();
+ LOGGER.info("Clan System: Data saved!!");
+
// Save data CountStore
TradeManager.getInstance().dataCountStore();
LOGGER.info("TradeController: All count Item Saved!!");
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index fe1a1de744..0d47f3b724 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -528,6 +528,14 @@ public class ClanTable
}
}
+ public void shutdown()
+ {
+ for (Clan clan : _clans.values())
+ {
+ clan.updateClanInDB();
+ }
+ }
+
public static ClanTable getInstance()
{
return SingletonHolder.INSTANCE;
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPledge.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPledge.java
index 5ef59ff088..c9a5c64012 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPledge.java
@@ -167,7 +167,7 @@ public class AdminPledge implements IAdminCommandHandler
showMainPage(activeChar);
return false;
}
- clan.setReputationScore(clan.getReputationScore() + points, true);
+ clan.setReputationScore(clan.getReputationScore() + 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());
return true;
}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java
index 6e7dac538a..5971dc23a0 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2508,15 +2508,15 @@ public class Player extends Playable
{
if (getLvlJoinedAcademy() <= 16)
{
- _clan.setReputationScore(_clan.getReputationScore() + 400, true);
+ _clan.setReputationScore(_clan.getReputationScore() + 400);
}
else if (getLvlJoinedAcademy() >= 39)
{
- _clan.setReputationScore(_clan.getReputationScore() + 170, true);
+ _clan.setReputationScore(_clan.getReputationScore() + 170);
}
else
{
- _clan.setReputationScore((_clan.getReputationScore() + 400) - ((getLvlJoinedAcademy() - 16) * 10), true);
+ _clan.setReputationScore((_clan.getReputationScore() + 400) - ((getLvlJoinedAcademy() - 16) * 10));
}
_clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(_clan));
@@ -5559,12 +5559,12 @@ public class Player extends Playable
{
if (getClan().getReputationScore() > 0)
{
- pk.getClan().setReputationScore(((Player) killer).getClan().getReputationScore() + 2, true);
+ pk.getClan().setReputationScore(((Player) killer).getClan().getReputationScore() + 2);
pk.getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(pk.getClan())); // Update status to all members
}
if (pk.getClan().getReputationScore() > 0)
{
- _clan.setReputationScore(_clan.getReputationScore() - 2, true);
+ _clan.setReputationScore(_clan.getReputationScore() - 2);
_clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(_clan)); // Update status to all members
}
}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 5b2bedbcf6..ca9a68bf32 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -826,7 +826,7 @@ public class Clan
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);
final int leaderId = clanData.getInt("leader_id");
@@ -1470,7 +1470,7 @@ public class Clan
if (pledgeType != -1)
{
- setReputationScore(_reputationScore - 2500, true);
+ setReputationScore(_reputationScore - 2500);
}
}
catch (Exception e)
@@ -1661,7 +1661,7 @@ public class Clan
return id;
}
- public void setReputationScore(int value, boolean save)
+ public void setReputationScore(int value)
{
if ((_reputationScore >= 0) && (value < 0))
{
@@ -1706,11 +1706,6 @@ public class Clan
{
_reputationScore = -100000000;
}
-
- if (save)
- {
- updateClanInDB();
- }
}
public int getReputationScore()
@@ -2202,7 +2197,7 @@ public class Clan
{
if ((_reputationScore >= 10000) && (_members.size() >= 30))
{
- setReputationScore(_reputationScore - 10000, true);
+ setReputationScore(_reputationScore - 10000);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addNumber(10000);
player.sendPacket(cr);
@@ -2214,7 +2209,7 @@ public class Clan
{
if ((_reputationScore >= 20000) && (_members.size() >= 80))
{
- setReputationScore(_reputationScore - 20000, true);
+ setReputationScore(_reputationScore - 20000);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addNumber(20000);
player.sendPacket(cr);
@@ -2226,7 +2221,7 @@ public class Clan
{
if ((_reputationScore >= 40000) && (_members.size() >= 120))
{
- setReputationScore(_reputationScore - 40000, true);
+ setReputationScore(_reputationScore - 40000);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addNumber(40000);
player.sendPacket(cr);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 8d7ecdd7c5..b1ed4a4e5a 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -339,7 +339,7 @@ public class Hero
final Clan clan = player.getClan();
if (clan != null)
{
- clan.setReputationScore(clan.getReputationScore() + 1000, true);
+ clan.setReputationScore(clan.getReputationScore() + 1000);
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_WAS_NAMED_A_HERO_2S_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE);
sm.addString(name);
@@ -366,7 +366,7 @@ public class Hero
final Clan clan = ClanTable.getInstance().getClanByName(clanName);
if (clan != null)
{
- clan.setReputationScore(clan.getReputationScore() + 1000, true);
+ clan.setReputationScore(clan.getReputationScore() + 1000);
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_WAS_NAMED_A_HERO_2S_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE);
sm.addString(name);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java
index ec9fb7cbb3..50fc6fe560 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java
@@ -3489,7 +3489,7 @@ public class SevenSignsFestival implements SpawnListener
{
if (player.getClan() != null)
{
- player.getClan().setReputationScore(player.getClan().getReputationScore() + 100, true);
+ player.getClan().setReputationScore(player.getClan().getReputationScore() + 100);
player.getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(player.getClan()));
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_WAS_AN_ACTIVE_MEMBER_OF_THE_HIGHEST_RANKED_PARTY_IN_THE_FESTIVAL_OF_DARKNESS_S2_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE);
sm.addString(partyMemberName);
@@ -3512,7 +3512,7 @@ public class SevenSignsFestival implements SpawnListener
final Clan clan = ClanTable.getInstance().getClanByName(clanName);
if (clan != null)
{
- clan.setReputationScore(clan.getReputationScore() + 100, true);
+ clan.setReputationScore(clan.getReputationScore() + 100);
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_WAS_AN_ACTIVE_MEMBER_OF_THE_HIGHEST_RANKED_PARTY_IN_THE_FESTIVAL_OF_DARKNESS_S2_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE);
sm.addString(partyMemberName);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 9314f75c4d..68184ce150 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1137,18 +1137,18 @@ public class Castle
if (_formerOwner != ClanTable.getInstance().getClan(getOwnerId()))
{
final int maxreward = Math.max(0, _formerOwner.getReputationScore());
- _formerOwner.setReputationScore(_formerOwner.getReputationScore() - 1000, true);
+ _formerOwner.setReputationScore(_formerOwner.getReputationScore() - 1000);
final Clan owner = ClanTable.getInstance().getClan(getOwnerId());
if (owner != null)
{
- owner.setReputationScore(owner.getReputationScore() + Math.min(1000, maxreward), true);
+ owner.setReputationScore(owner.getReputationScore() + Math.min(1000, maxreward));
owner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(owner));
}
}
else
{
- _formerOwner.setReputationScore(_formerOwner.getReputationScore() + 500, true);
+ _formerOwner.setReputationScore(_formerOwner.getReputationScore() + 500);
}
_formerOwner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(_formerOwner));
@@ -1158,7 +1158,7 @@ public class Castle
final Clan owner = ClanTable.getInstance().getClan(getOwnerId());
if (owner != null)
{
- owner.setReputationScore(owner.getReputationScore() + 1000, true);
+ owner.setReputationScore(owner.getReputationScore() + 1000);
owner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(owner));
}
}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 98bf19ca08..618694ad6e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -592,13 +592,13 @@ public class Fort
final Clan owner = ClanTable.getInstance().getClan(getOwnerId());
if (owner != null)
{
- owner.setReputationScore(owner.getReputationScore() + Math.min(500, maxreward), true);
+ owner.setReputationScore(owner.getReputationScore() + Math.min(500, maxreward));
owner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(owner));
}
}
else
{
- _formerOwner.setReputationScore(_formerOwner.getReputationScore() + 250, true);
+ _formerOwner.setReputationScore(_formerOwner.getReputationScore() + 250);
}
_formerOwner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(_formerOwner));
@@ -608,7 +608,7 @@ public class Fort
final Clan owner = ClanTable.getInstance().getClan(getOwnerId());
if (owner != null)
{
- owner.setReputationScore(owner.getReputationScore() + 500, true);
+ owner.setReputationScore(owner.getReputationScore() + 500);
owner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(owner));
}
}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java
index 5115629bd3..290d4714d5 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java
@@ -797,7 +797,7 @@ public class DevastatedCastle
if (clanIdMaxDamage != null)
{
ClanHallTable.getInstance().setOwner(34, clanIdMaxDamage);
- clanIdMaxDamage.setReputationScore(clanIdMaxDamage.getReputationScore() + 600, true);
+ clanIdMaxDamage.setReputationScore(clanIdMaxDamage.getReputationScore() + 600);
update();
Announce("Siege of Devastated castle is over.");
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java
index c4ab87bbeb..d1ebb10d7d 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java
@@ -300,7 +300,7 @@ public class FortressOfResistance
if (clanIdMaxDamage != null)
{
ClanHallTable.getInstance().setOwner(21, clanIdMaxDamage);
- clanIdMaxDamage.setReputationScore(clanIdMaxDamage.getReputationScore() + 600, true);
+ clanIdMaxDamage.setReputationScore(clanIdMaxDamage.getReputationScore() + 600);
update();
Announce("Capture of Partisan Hideout is over.");
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index d7f19dbc8e..81a4af1554 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -360,7 +360,7 @@ public class MultiSellChoose implements IClientIncomingPacket
else if (e.getItemId() == 65336)
{
final int repCost = player.getClan().getReputationScore() - e.getItemCount();
- player.getClan().setReputationScore(repCost, true);
+ player.getClan().setReputationScore(repCost);
player.sendPacket(new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE).addNumber(e.getItemCount()));
player.getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(player.getClan()));
}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java
index e38f8552eb..bf437745bd 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java
@@ -246,7 +246,7 @@ public class RequestAquireSkill implements IClientIncomingPacket
player.sendPacket(new SystemMessage(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION_SCORE));
return;
}
- player.getClan().setReputationScore(player.getClan().getReputationScore() - repCost, true);
+ player.getClan().setReputationScore(player.getClan().getReputationScore() - repCost);
player.getClan().addNewSkill(skill);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java
index 8e53fbeafb..56161369e4 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java
@@ -130,7 +130,7 @@ public class TaskRaidPointsReset extends Task
break;
}
}
- c.setReputationScore(c.getReputationScore() + reputation, true);
+ c.setReputationScore(c.getReputationScore() + reputation);
}
}
}
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/Q508_AClansReputation.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/Q508_AClansReputation.java
index c076e0e167..cf05abdf73 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/Q508_AClansReputation.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/Q508_AClansReputation.java
@@ -160,7 +160,7 @@ public class Q508_AClansReputation extends Quest
{
htmltext = "30868-" + raid + "b.htm";
st.takeItems(item, 1);
- clan.setReputationScore(clan.getReputationScore() + reward, true);
+ clan.setReputationScore(clan.getReputationScore() + reward);
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUCCESSFULLY_COMPLETED_A_CLAN_QUEST_S1_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE).addNumber(reward));
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
}
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/Q509_TheClansPrestige.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/Q509_TheClansPrestige.java
index 7e33bcebec..82d55a34a1 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/Q509_TheClansPrestige.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/Q509_TheClansPrestige.java
@@ -157,7 +157,7 @@ public class Q509_TheClansPrestige extends Quest
{
htmltext = "31331-" + raid + "b.htm";
st.takeItems(item, 1);
- clan.setReputationScore(clan.getReputationScore() + reward, true);
+ clan.setReputationScore(clan.getReputationScore() + reward);
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUCCESSFULLY_COMPLETED_A_CLAN_QUEST_S1_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE).addNumber(reward));
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
}
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q510_AClansReputation/Q510_AClansReputation.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q510_AClansReputation/Q510_AClansReputation.java
index 873ff9be50..71d1dedd7f 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q510_AClansReputation/Q510_AClansReputation.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q510_AClansReputation/Q510_AClansReputation.java
@@ -107,7 +107,7 @@ public class Q510_AClansReputation extends Quest
final int reward = (CLAN_POINTS_REWARD * count);
st.takeItems(CLAW, -1);
final Clan clan = player.getClan();
- clan.setReputationScore(clan.getReputationScore() + reward, true);
+ clan.setReputationScore(clan.getReputationScore() + reward);
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUCCESSFULLY_COMPLETED_A_CLAN_QUEST_S1_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE).addNumber(reward));
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
htmltext = "31331-7.htm";
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
index 77d678bff7..8d8a397c8b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
@@ -24,6 +24,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.SchemeBufferTable;
import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
+import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.data.sql.OfflineTraderTable;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
@@ -447,6 +448,10 @@ public class Shutdown extends Thread
GrandBossManager.getInstance().cleanUp();
LOGGER.info("GrandBossManager: All Grand Boss info saved!!");
+ // Save clan data.
+ ClanTable.getInstance().shutdown();
+ LOGGER.info("Clan System: Data saved!!");
+
// Save data CountStore
TradeManager.getInstance().dataCountStore();
LOGGER.info("TradeController: All count Item Saved!!");
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index fe1a1de744..0d47f3b724 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -528,6 +528,14 @@ public class ClanTable
}
}
+ public void shutdown()
+ {
+ for (Clan clan : _clans.values())
+ {
+ clan.updateClanInDB();
+ }
+ }
+
public static ClanTable getInstance()
{
return SingletonHolder.INSTANCE;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPledge.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPledge.java
index 5ef59ff088..c9a5c64012 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminPledge.java
@@ -167,7 +167,7 @@ public class AdminPledge implements IAdminCommandHandler
showMainPage(activeChar);
return false;
}
- clan.setReputationScore(clan.getReputationScore() + points, true);
+ clan.setReputationScore(clan.getReputationScore() + 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());
return true;
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
index 4965ec6ebb..e167e29f0f 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2576,15 +2576,15 @@ public class Player extends Playable
{
if (getLvlJoinedAcademy() <= 16)
{
- _clan.setReputationScore(_clan.getReputationScore() + 400, true);
+ _clan.setReputationScore(_clan.getReputationScore() + 400);
}
else if (getLvlJoinedAcademy() >= 39)
{
- _clan.setReputationScore(_clan.getReputationScore() + 170, true);
+ _clan.setReputationScore(_clan.getReputationScore() + 170);
}
else
{
- _clan.setReputationScore((_clan.getReputationScore() + 400) - ((getLvlJoinedAcademy() - 16) * 10), true);
+ _clan.setReputationScore((_clan.getReputationScore() + 400) - ((getLvlJoinedAcademy() - 16) * 10));
}
_clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(_clan));
@@ -5663,12 +5663,12 @@ public class Player extends Playable
{
if (getClan().getReputationScore() > 0)
{
- pk.getClan().setReputationScore(((Player) killer).getClan().getReputationScore() + 2, true);
+ pk.getClan().setReputationScore(((Player) killer).getClan().getReputationScore() + 2);
pk.getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(pk.getClan())); // Update status to all members
}
if (pk.getClan().getReputationScore() > 0)
{
- _clan.setReputationScore(_clan.getReputationScore() - 2, true);
+ _clan.setReputationScore(_clan.getReputationScore() - 2);
_clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(_clan)); // Update status to all members
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
index afc6c0058a..9cd9a2cb04 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -827,7 +827,7 @@ public class Clan
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);
final int leaderId = clanData.getInt("leader_id");
@@ -1487,7 +1487,7 @@ public class Clan
if (pledgeType != -1)
{
- setReputationScore(_reputationScore - 2500, true);
+ setReputationScore(_reputationScore - 2500);
}
}
catch (Exception e)
@@ -1678,7 +1678,7 @@ public class Clan
return id;
}
- public void setReputationScore(int value, boolean save)
+ public void setReputationScore(int value)
{
if ((_reputationScore >= 0) && (value < 0))
{
@@ -1723,11 +1723,6 @@ public class Clan
{
_reputationScore = -100000000;
}
-
- if (save)
- {
- updateClanInDB();
- }
}
public int getReputationScore()
@@ -2219,7 +2214,7 @@ public class Clan
{
if ((_reputationScore >= 10000) && (_members.size() >= 30))
{
- setReputationScore(_reputationScore - 10000, true);
+ setReputationScore(_reputationScore - 10000);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addNumber(10000);
player.sendPacket(cr);
@@ -2231,7 +2226,7 @@ public class Clan
{
if ((_reputationScore >= 20000) && (_members.size() >= 80))
{
- setReputationScore(_reputationScore - 20000, true);
+ setReputationScore(_reputationScore - 20000);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addNumber(20000);
player.sendPacket(cr);
@@ -2243,7 +2238,7 @@ public class Clan
{
if ((_reputationScore >= 40000) && (_members.size() >= 120))
{
- setReputationScore(_reputationScore - 40000, true);
+ setReputationScore(_reputationScore - 40000);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addNumber(40000);
player.sendPacket(cr);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 8d7ecdd7c5..b1ed4a4e5a 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -339,7 +339,7 @@ public class Hero
final Clan clan = player.getClan();
if (clan != null)
{
- clan.setReputationScore(clan.getReputationScore() + 1000, true);
+ clan.setReputationScore(clan.getReputationScore() + 1000);
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_WAS_NAMED_A_HERO_2S_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE);
sm.addString(name);
@@ -366,7 +366,7 @@ public class Hero
final Clan clan = ClanTable.getInstance().getClanByName(clanName);
if (clan != null)
{
- clan.setReputationScore(clan.getReputationScore() + 1000, true);
+ clan.setReputationScore(clan.getReputationScore() + 1000);
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_WAS_NAMED_A_HERO_2S_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE);
sm.addString(name);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java
index ec9fb7cbb3..50fc6fe560 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java
@@ -3489,7 +3489,7 @@ public class SevenSignsFestival implements SpawnListener
{
if (player.getClan() != null)
{
- player.getClan().setReputationScore(player.getClan().getReputationScore() + 100, true);
+ player.getClan().setReputationScore(player.getClan().getReputationScore() + 100);
player.getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(player.getClan()));
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_WAS_AN_ACTIVE_MEMBER_OF_THE_HIGHEST_RANKED_PARTY_IN_THE_FESTIVAL_OF_DARKNESS_S2_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE);
sm.addString(partyMemberName);
@@ -3512,7 +3512,7 @@ public class SevenSignsFestival implements SpawnListener
final Clan clan = ClanTable.getInstance().getClanByName(clanName);
if (clan != null)
{
- clan.setReputationScore(clan.getReputationScore() + 100, true);
+ clan.setReputationScore(clan.getReputationScore() + 100);
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_WAS_AN_ACTIVE_MEMBER_OF_THE_HIGHEST_RANKED_PARTY_IN_THE_FESTIVAL_OF_DARKNESS_S2_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE);
sm.addString(partyMemberName);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 9314f75c4d..68184ce150 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1137,18 +1137,18 @@ public class Castle
if (_formerOwner != ClanTable.getInstance().getClan(getOwnerId()))
{
final int maxreward = Math.max(0, _formerOwner.getReputationScore());
- _formerOwner.setReputationScore(_formerOwner.getReputationScore() - 1000, true);
+ _formerOwner.setReputationScore(_formerOwner.getReputationScore() - 1000);
final Clan owner = ClanTable.getInstance().getClan(getOwnerId());
if (owner != null)
{
- owner.setReputationScore(owner.getReputationScore() + Math.min(1000, maxreward), true);
+ owner.setReputationScore(owner.getReputationScore() + Math.min(1000, maxreward));
owner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(owner));
}
}
else
{
- _formerOwner.setReputationScore(_formerOwner.getReputationScore() + 500, true);
+ _formerOwner.setReputationScore(_formerOwner.getReputationScore() + 500);
}
_formerOwner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(_formerOwner));
@@ -1158,7 +1158,7 @@ public class Castle
final Clan owner = ClanTable.getInstance().getClan(getOwnerId());
if (owner != null)
{
- owner.setReputationScore(owner.getReputationScore() + 1000, true);
+ owner.setReputationScore(owner.getReputationScore() + 1000);
owner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(owner));
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 98bf19ca08..618694ad6e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -592,13 +592,13 @@ public class Fort
final Clan owner = ClanTable.getInstance().getClan(getOwnerId());
if (owner != null)
{
- owner.setReputationScore(owner.getReputationScore() + Math.min(500, maxreward), true);
+ owner.setReputationScore(owner.getReputationScore() + Math.min(500, maxreward));
owner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(owner));
}
}
else
{
- _formerOwner.setReputationScore(_formerOwner.getReputationScore() + 250, true);
+ _formerOwner.setReputationScore(_formerOwner.getReputationScore() + 250);
}
_formerOwner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(_formerOwner));
@@ -608,7 +608,7 @@ public class Fort
final Clan owner = ClanTable.getInstance().getClan(getOwnerId());
if (owner != null)
{
- owner.setReputationScore(owner.getReputationScore() + 500, true);
+ owner.setReputationScore(owner.getReputationScore() + 500);
owner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(owner));
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java
index 5115629bd3..290d4714d5 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java
@@ -797,7 +797,7 @@ public class DevastatedCastle
if (clanIdMaxDamage != null)
{
ClanHallTable.getInstance().setOwner(34, clanIdMaxDamage);
- clanIdMaxDamage.setReputationScore(clanIdMaxDamage.getReputationScore() + 600, true);
+ clanIdMaxDamage.setReputationScore(clanIdMaxDamage.getReputationScore() + 600);
update();
Announce("Siege of Devastated castle is over.");
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java
index c4ab87bbeb..d1ebb10d7d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java
@@ -300,7 +300,7 @@ public class FortressOfResistance
if (clanIdMaxDamage != null)
{
ClanHallTable.getInstance().setOwner(21, clanIdMaxDamage);
- clanIdMaxDamage.setReputationScore(clanIdMaxDamage.getReputationScore() + 600, true);
+ clanIdMaxDamage.setReputationScore(clanIdMaxDamage.getReputationScore() + 600);
update();
Announce("Capture of Partisan Hideout is over.");
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index d2601f4b27..16a3d3b63a 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -376,7 +376,7 @@ public class MultiSellChoose implements IClientIncomingPacket
else if (e.getItemId() == 65336)
{
final int repCost = player.getClan().getReputationScore() - e.getItemCount();
- player.getClan().setReputationScore(repCost, true);
+ player.getClan().setReputationScore(repCost);
player.sendPacket(new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE).addNumber(e.getItemCount()));
player.getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(player.getClan()));
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java
index e38f8552eb..bf437745bd 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java
@@ -246,7 +246,7 @@ public class RequestAquireSkill implements IClientIncomingPacket
player.sendPacket(new SystemMessage(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION_SCORE));
return;
}
- player.getClan().setReputationScore(player.getClan().getReputationScore() - repCost, true);
+ player.getClan().setReputationScore(player.getClan().getReputationScore() - repCost);
player.getClan().addNewSkill(skill);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java
index 8e53fbeafb..56161369e4 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java
@@ -130,7 +130,7 @@ public class TaskRaidPointsReset extends Task
break;
}
}
- c.setReputationScore(c.getReputationScore() + reputation, true);
+ c.setReputationScore(c.getReputationScore() + reputation);
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Ballista.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Ballista.java
index 41628d9194..f031a0511e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Ballista.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/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_S_REPUTATION_WILL_BE_INCREASED);
}
npc.doDie(caster);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index f89d7d9c58..d6ab16eb9c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/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_1S_POINTS_TO_ITS_CLAN_REPUTATION_SCORE);
sm.addInt(count);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index 00acf7d59f..4e0d7f9c2e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/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_FAME_POINTS);
htmltext = npc.getId() + "-04.html";
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 2c36ee6d9b..2b8e4294ee 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
@@ -147,7 +147,7 @@ public class AdminPledge implements IAdminCommandHandler
showMainPage(activeChar);
return false;
}
- 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_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 405375100e..865eb0b656 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/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_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE).addInt(rep));
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index b4e598c2c4..150c95ef9f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -181,7 +181,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_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE).addInt(rep));
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index aa6bc8bb07..ad478b5c25 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -140,7 +140,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_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE).addInt(reward));
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
htmltext = "31331-7.html";
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index bf2e39a3bc..ee4ed00bab 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -535,7 +535,7 @@ public class ClanTable
{
for (Clan clan : _clans.values())
{
- clan.updateInDB();
+ clan.updateClanInDB();
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
index 16536f35a9..0958dc86ab 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
@@ -317,7 +317,7 @@ public class MultisellData implements IXmlReader
{
case CLAN_REPUTATION:
{
- player.getClan().takeReputationScore((int) amount, true);
+ player.getClan().takeReputationScore((int) amount);
final SystemMessage smsg = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
smsg.addLong(amount);
player.sendPacket(smsg);
@@ -340,7 +340,7 @@ public class MultisellData implements IXmlReader
{
case CLAN_REPUTATION:
{
- player.getClan().addReputationScore((int) amount, true);
+ player.getClan().addReputationScore((int) amount);
break;
}
case FAME:
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java
index 8d9f7d8284..9e4061bcb6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2391,15 +2391,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
@@ -5265,12 +5265,12 @@ public class Player extends Playable
// when your reputation score is 0 or below, the other clan cannot acquire any reputation points
if (_clan.getReputationScore() > 0)
{
- pk.getClan().addReputationScore(Config.REPUTATION_SCORE_PER_KILL, false);
+ pk.getClan().addReputationScore(Config.REPUTATION_SCORE_PER_KILL);
}
// when the opposing sides reputation score is 0 or below, your clans reputation score does not decrease
if (pk.getClan().getReputationScore() > 0)
{
- _clan.takeReputationScore(Config.REPUTATION_SCORE_PER_KILL, false);
+ _clan.takeReputationScore(Config.REPUTATION_SCORE_PER_KILL);
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 998047a2b4..d0fe9ad25f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -929,24 +929,6 @@ public class Clan implements IIdentifiable, INamable
}
}
- /**
- * Store in database current clan's reputation.
- */
- public void updateInDB()
- {
- 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);
- }
- }
-
/**
* Updates in database clan information:
*
@@ -1090,7 +1072,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);
@@ -1890,11 +1872,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
}
}
@@ -2089,17 +2071,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))
{
@@ -2133,11 +2115,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
@@ -2570,7 +2549,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_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(Config.CLAN_LEVEL_6_COST);
player.sendPacket(cr);
@@ -2583,7 +2562,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_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(Config.CLAN_LEVEL_7_COST);
player.sendPacket(cr);
@@ -2596,7 +2575,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_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(Config.CLAN_LEVEL_8_COST);
player.sendPacket(cr);
@@ -2609,7 +2588,7 @@ public class Clan implements IIdentifiable, INamable
// Upgrade to 9 (itemId 9910 = Blood Oath)
if ((_reputationScore >= Config.CLAN_LEVEL_9_COST) && (player.getInventory().getItemByItemId(9910) != null) && (_members.size() >= Config.CLAN_LEVEL_9_REQUIREMENT) && 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_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(Config.CLAN_LEVEL_9_COST);
player.sendPacket(cr);
@@ -2629,7 +2608,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_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(Config.CLAN_LEVEL_10_COST);
player.sendPacket(cr);
@@ -2656,7 +2635,7 @@ public class Clan implements IIdentifiable, INamable
}
if (hasTerritory && (_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_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(Config.CLAN_LEVEL_11_COST);
player.sendPacket(cr);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 216c951efc..d62f2d06a3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -905,7 +905,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_S_REPUTATION_SCORE);
sm.addString(CharNameTable.getInstance().getNameById(player.getObjectId()));
sm.addInt(Config.HERO_POINTS);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java
index 9f61928660..9dd9df31d8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java
@@ -1102,7 +1102,7 @@ public class SevenSignsFestival implements SpawnListener
{
if (player.getClan() != null)
{
- player.getClan().addReputationScore(Config.FESTIVAL_WIN_POINTS, true);
+ player.getClan().addReputationScore(Config.FESTIVAL_WIN_POINTS);
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_C1_WAS_AN_ACTIVE_MEMBER_OF_THE_HIGHEST_RANKED_PARTY_IN_THE_FESTIVAL_OF_DARKNESS_S2_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE);
sm.addString(partyMemberName);
sm.addInt(Config.FESTIVAL_WIN_POINTS);
@@ -1125,7 +1125,7 @@ public class SevenSignsFestival implements SpawnListener
final Clan clan = ClanTable.getInstance().getClanByName(clanName);
if (clan != null)
{
- clan.addReputationScore(Config.FESTIVAL_WIN_POINTS, true);
+ clan.addReputationScore(Config.FESTIVAL_WIN_POINTS);
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_C1_WAS_AN_ACTIVE_MEMBER_OF_THE_HIGHEST_RANKED_PARTY_IN_THE_FESTIVAL_OF_DARKNESS_S2_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE);
sm.addString(partyMemberName);
sm.addInt(Config.FESTIVAL_WIN_POINTS);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Castle.java
index fb1c50e5be..f5736c1998 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -967,16 +967,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
@@ -984,7 +984,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);
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 48472fef38..5ef47f15f9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -932,11 +932,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);
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 0ab14c10e5..6b4d3c4e15 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -201,7 +201,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
}
}
- clan.takeReputationScore(repCost, true);
+ clan.takeReputationScore(repCost);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(repCost);
@@ -264,7 +264,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (repCost > 0)
{
- clan.takeReputationScore(repCost, true);
+ clan.takeReputationScore(repCost);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(repCost);
player.sendPacket(cr);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java
index ff33ceb347..f1635e610b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java
@@ -119,7 +119,7 @@ public class TaskRaidPointsReset extends Task
break;
}
}
- c.addReputationScore(reputation, true);
+ c.addReputationScore(reputation);
}
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Ballista.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Ballista.java
index 41628d9194..f031a0511e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Ballista.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_S_REPUTATION_WILL_BE_INCREASED);
}
npc.doDie(caster);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index f89d7d9c58..d6ab16eb9c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_1S_POINTS_TO_ITS_CLAN_REPUTATION_SCORE);
sm.addInt(count);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index 00acf7d59f..4e0d7f9c2e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_FAME_POINTS);
htmltext = npc.getId() + "-04.html";
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 2c36ee6d9b..2b8e4294ee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
@@ -147,7 +147,7 @@ public class AdminPledge implements IAdminCommandHandler
showMainPage(activeChar);
return false;
}
- 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_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 405375100e..865eb0b656 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/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_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE).addInt(rep));
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index b4e598c2c4..150c95ef9f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -181,7 +181,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_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE).addInt(rep));
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index aa6bc8bb07..ad478b5c25 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -140,7 +140,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_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE).addInt(reward));
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
htmltext = "31331-7.html";
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index bf2e39a3bc..ee4ed00bab 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -535,7 +535,7 @@ public class ClanTable
{
for (Clan clan : _clans.values())
{
- clan.updateInDB();
+ clan.updateClanInDB();
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
index 16536f35a9..0958dc86ab 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
@@ -317,7 +317,7 @@ public class MultisellData implements IXmlReader
{
case CLAN_REPUTATION:
{
- player.getClan().takeReputationScore((int) amount, true);
+ player.getClan().takeReputationScore((int) amount);
final SystemMessage smsg = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
smsg.addLong(amount);
player.sendPacket(smsg);
@@ -340,7 +340,7 @@ public class MultisellData implements IXmlReader
{
case CLAN_REPUTATION:
{
- player.getClan().addReputationScore((int) amount, true);
+ player.getClan().addReputationScore((int) amount);
break;
}
case FAME:
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java
index a0051e6d8e..9d915bc802 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2302,15 +2302,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
@@ -5155,12 +5155,12 @@ public class Player extends Playable
// when your reputation score is 0 or below, the other clan cannot acquire any reputation points
if (_clan.getReputationScore() > 0)
{
- pk.getClan().addReputationScore(Config.REPUTATION_SCORE_PER_KILL, false);
+ pk.getClan().addReputationScore(Config.REPUTATION_SCORE_PER_KILL);
}
// when the opposing sides reputation score is 0 or below, your clans reputation score does not decrease
if (pk.getClan().getReputationScore() > 0)
{
- _clan.takeReputationScore(Config.REPUTATION_SCORE_PER_KILL, false);
+ _clan.takeReputationScore(Config.REPUTATION_SCORE_PER_KILL);
}
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 998047a2b4..d0fe9ad25f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -929,24 +929,6 @@ public class Clan implements IIdentifiable, INamable
}
}
- /**
- * Store in database current clan's reputation.
- */
- public void updateInDB()
- {
- 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);
- }
- }
-
/**
* Updates in database clan information:
*
@@ -1090,7 +1072,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);
@@ -1890,11 +1872,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
}
}
@@ -2089,17 +2071,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))
{
@@ -2133,11 +2115,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
@@ -2570,7 +2549,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_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(Config.CLAN_LEVEL_6_COST);
player.sendPacket(cr);
@@ -2583,7 +2562,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_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(Config.CLAN_LEVEL_7_COST);
player.sendPacket(cr);
@@ -2596,7 +2575,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_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(Config.CLAN_LEVEL_8_COST);
player.sendPacket(cr);
@@ -2609,7 +2588,7 @@ public class Clan implements IIdentifiable, INamable
// Upgrade to 9 (itemId 9910 = Blood Oath)
if ((_reputationScore >= Config.CLAN_LEVEL_9_COST) && (player.getInventory().getItemByItemId(9910) != null) && (_members.size() >= Config.CLAN_LEVEL_9_REQUIREMENT) && 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_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(Config.CLAN_LEVEL_9_COST);
player.sendPacket(cr);
@@ -2629,7 +2608,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_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(Config.CLAN_LEVEL_10_COST);
player.sendPacket(cr);
@@ -2656,7 +2635,7 @@ public class Clan implements IIdentifiable, INamable
}
if (hasTerritory && (_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_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(Config.CLAN_LEVEL_11_COST);
player.sendPacket(cr);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 4348731835..0254c6ce3d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -905,7 +905,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_S_REPUTATION_SCORE);
sm.addString(CharNameTable.getInstance().getNameById(player.getObjectId()));
sm.addInt(Config.HERO_POINTS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java
index 9f61928660..9dd9df31d8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java
@@ -1102,7 +1102,7 @@ public class SevenSignsFestival implements SpawnListener
{
if (player.getClan() != null)
{
- player.getClan().addReputationScore(Config.FESTIVAL_WIN_POINTS, true);
+ player.getClan().addReputationScore(Config.FESTIVAL_WIN_POINTS);
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_C1_WAS_AN_ACTIVE_MEMBER_OF_THE_HIGHEST_RANKED_PARTY_IN_THE_FESTIVAL_OF_DARKNESS_S2_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE);
sm.addString(partyMemberName);
sm.addInt(Config.FESTIVAL_WIN_POINTS);
@@ -1125,7 +1125,7 @@ public class SevenSignsFestival implements SpawnListener
final Clan clan = ClanTable.getInstance().getClanByName(clanName);
if (clan != null)
{
- clan.addReputationScore(Config.FESTIVAL_WIN_POINTS, true);
+ clan.addReputationScore(Config.FESTIVAL_WIN_POINTS);
final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_C1_WAS_AN_ACTIVE_MEMBER_OF_THE_HIGHEST_RANKED_PARTY_IN_THE_FESTIVAL_OF_DARKNESS_S2_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE);
sm.addString(partyMemberName);
sm.addInt(Config.FESTIVAL_WIN_POINTS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Castle.java
index fb1c50e5be..f5736c1998 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -967,16 +967,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
@@ -984,7 +984,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);
}
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java
index 48472fef38..5ef47f15f9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -932,11 +932,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);
}
}
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 0ab14c10e5..6b4d3c4e15 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -201,7 +201,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
}
}
- clan.takeReputationScore(repCost, true);
+ clan.takeReputationScore(repCost);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(repCost);
@@ -264,7 +264,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
if (repCost > 0)
{
- clan.takeReputationScore(repCost, true);
+ clan.takeReputationScore(repCost);
final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
cr.addInt(repCost);
player.sendPacket(cr);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java
index ff33ceb347..f1635e610b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskRaidPointsReset.java
@@ -119,7 +119,7 @@ public class TaskRaidPointsReset extends Task
break;
}
}
- c.addReputationScore(reputation, true);
+ c.addReputationScore(reputation);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 7588b315c7..cdd4d1e894 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/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_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
@@ -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_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 57182a418f..ff17f694f3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
index e88a0f3b98..6265a38b6b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2374,15 +2374,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
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 4552b070ca..ab69ac3799 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -349,7 +349,7 @@ public class PlayableStat extends CreatureStat
reputation = (int) Math.ceil(reputation * Config.LVL_OBTAINED_REP_SCORE_MULTIPLIER);
- clan.addReputationScore(reputation, true);
+ clan.addReputationScore(reputation);
for (ClanMember member : clan.getMembers())
{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java
index a4406d2d06..3c995031df 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -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:
*
@@ -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);
@@ -1895,11 +1873,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
}
}
@@ -2093,17 +2071,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))
{
@@ -2137,11 +2115,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index a664008e73..abd2b2d94b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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(500, true);
+ cancelor.takeReputationScore(500);
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());
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 7929fbbe60..92e8dc4386 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -906,7 +906,7 @@ public class Hero
final Clan clan = player.getClan();
if ((clan != null) && (clan.getLevel() >= 3))
{
- 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);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 41938fda69..ae73426ffa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1015,16 +1015,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
@@ -1032,7 +1032,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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index b0bc947197..55ce5f16e0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 91a2b46047..5d3c284100 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 45cab77cbf..a1f5312090 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index d4c1bad3b7..bc2857e475 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -88,7 +88,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket
}
// Reduce reputation.
- playerClan.takeReputationScore(500, true);
+ playerClan.takeReputationScore(500);
ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (Player member : playerClan.getOnlineMembers(0))
{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 7588b315c7..cdd4d1e894 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/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_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
@@ -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_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 57182a418f..ff17f694f3 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
index 40fe816be3..0b2de17456 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2374,15 +2374,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
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 4552b070ca..ab69ac3799 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -349,7 +349,7 @@ public class PlayableStat extends CreatureStat
reputation = (int) Math.ceil(reputation * Config.LVL_OBTAINED_REP_SCORE_MULTIPLIER);
- clan.addReputationScore(reputation, true);
+ clan.addReputationScore(reputation);
for (ClanMember member : clan.getMembers())
{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java
index a4406d2d06..3c995031df 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -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:
*
@@ -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);
@@ -1895,11 +1873,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
}
}
@@ -2093,17 +2071,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))
{
@@ -2137,11 +2115,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index a664008e73..abd2b2d94b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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(500, true);
+ cancelor.takeReputationScore(500);
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());
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 7929fbbe60..92e8dc4386 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -906,7 +906,7 @@ public class Hero
final Clan clan = player.getClan();
if ((clan != null) && (clan.getLevel() >= 3))
{
- 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);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 41938fda69..ae73426ffa 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1015,16 +1015,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
@@ -1032,7 +1032,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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index b0bc947197..55ce5f16e0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 91a2b46047..5d3c284100 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 45cab77cbf..a1f5312090 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index d4c1bad3b7..bc2857e475 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -88,7 +88,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket
}
// Reduce reputation.
- playerClan.takeReputationScore(500, true);
+ playerClan.takeReputationScore(500);
ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (Player member : playerClan.getOnlineMembers(0))
{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 7588b315c7..cdd4d1e894 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/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_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
@@ -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_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 57182a418f..ff17f694f3 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
index c88e7dd311..cc18acd33a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2372,15 +2372,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
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 4552b070ca..ab69ac3799 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -349,7 +349,7 @@ public class PlayableStat extends CreatureStat
reputation = (int) Math.ceil(reputation * Config.LVL_OBTAINED_REP_SCORE_MULTIPLIER);
- clan.addReputationScore(reputation, true);
+ clan.addReputationScore(reputation);
for (ClanMember member : clan.getMembers())
{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 1536733735..c0ce2c51da 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -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:
*
@@ -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);
@@ -1895,11 +1873,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
}
}
@@ -2093,17 +2071,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))
{
@@ -2137,11 +2115,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index a664008e73..abd2b2d94b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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(500, true);
+ cancelor.takeReputationScore(500);
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());
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 7929fbbe60..92e8dc4386 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -906,7 +906,7 @@ public class Hero
final Clan clan = player.getClan();
if ((clan != null) && (clan.getLevel() >= 3))
{
- 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);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 41938fda69..ae73426ffa 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1015,16 +1015,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
@@ -1032,7 +1032,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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index b0bc947197..55ce5f16e0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 91a2b46047..5d3c284100 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 353d680abb..0caa251309 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index d4c1bad3b7..bc2857e475 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -88,7 +88,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket
}
// Reduce reputation.
- playerClan.takeReputationScore(500, true);
+ playerClan.takeReputationScore(500);
ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (Player member : playerClan.getOnlineMembers(0))
{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 7588b315c7..cdd4d1e894 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/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_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
@@ -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_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 57182a418f..ff17f694f3 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
index d540e8adcd..17120e8088 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2385,15 +2385,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
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 4552b070ca..ab69ac3799 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -349,7 +349,7 @@ public class PlayableStat extends CreatureStat
reputation = (int) Math.ceil(reputation * Config.LVL_OBTAINED_REP_SCORE_MULTIPLIER);
- clan.addReputationScore(reputation, true);
+ clan.addReputationScore(reputation);
for (ClanMember member : clan.getMembers())
{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 1536733735..c0ce2c51da 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -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:
*
@@ -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);
@@ -1895,11 +1873,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
}
}
@@ -2093,17 +2071,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))
{
@@ -2137,11 +2115,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index a664008e73..abd2b2d94b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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(500, true);
+ cancelor.takeReputationScore(500);
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());
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 7929fbbe60..92e8dc4386 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -906,7 +906,7 @@ public class Hero
final Clan clan = player.getClan();
if ((clan != null) && (clan.getLevel() >= 3))
{
- 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);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 41938fda69..ae73426ffa 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1015,16 +1015,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
@@ -1032,7 +1032,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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index b0bc947197..55ce5f16e0 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 91a2b46047..5d3c284100 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index ac4d13ece2..542c49de02 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index d4c1bad3b7..bc2857e475 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -88,7 +88,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket
}
// Reduce reputation.
- playerClan.takeReputationScore(500, true);
+ playerClan.takeReputationScore(500);
ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (Player member : playerClan.getOnlineMembers(0))
{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 7588b315c7..cdd4d1e894 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/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_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
@@ -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_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 57182a418f..ff17f694f3 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
index ba4ea2e1fc..9cfac7b6d7 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2385,15 +2385,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
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 4552b070ca..ab69ac3799 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -349,7 +349,7 @@ public class PlayableStat extends CreatureStat
reputation = (int) Math.ceil(reputation * Config.LVL_OBTAINED_REP_SCORE_MULTIPLIER);
- clan.addReputationScore(reputation, true);
+ clan.addReputationScore(reputation);
for (ClanMember member : clan.getMembers())
{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 1536733735..c0ce2c51da 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -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:
*
@@ -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);
@@ -1895,11 +1873,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
}
}
@@ -2093,17 +2071,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))
{
@@ -2137,11 +2115,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index a664008e73..abd2b2d94b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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(500, true);
+ cancelor.takeReputationScore(500);
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());
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 7929fbbe60..92e8dc4386 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -906,7 +906,7 @@ public class Hero
final Clan clan = player.getClan();
if ((clan != null) && (clan.getLevel() >= 3))
{
- 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);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 41938fda69..ae73426ffa 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1015,16 +1015,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
@@ -1032,7 +1032,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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index b0bc947197..55ce5f16e0 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 91a2b46047..5d3c284100 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index ac4d13ece2..542c49de02 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index d4c1bad3b7..bc2857e475 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -88,7 +88,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket
}
// Reduce reputation.
- playerClan.takeReputationScore(500, true);
+ playerClan.takeReputationScore(500);
ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (Player member : playerClan.getOnlineMembers(0))
{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 7588b315c7..cdd4d1e894 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/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_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
@@ -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_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 57182a418f..ff17f694f3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
index 1d4a0f8e4b..7aa0297dfc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2311,15 +2311,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
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 4552b070ca..ab69ac3799 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -349,7 +349,7 @@ public class PlayableStat extends CreatureStat
reputation = (int) Math.ceil(reputation * Config.LVL_OBTAINED_REP_SCORE_MULTIPLIER);
- clan.addReputationScore(reputation, true);
+ clan.addReputationScore(reputation);
for (ClanMember member : clan.getMembers())
{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 1536733735..c0ce2c51da 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -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:
*
@@ -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);
@@ -1895,11 +1873,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
}
}
@@ -2093,17 +2071,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))
{
@@ -2137,11 +2115,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index a664008e73..abd2b2d94b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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(500, true);
+ cancelor.takeReputationScore(500);
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());
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 44a87d7c08..212d62487c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -931,7 +931,7 @@ public class Hero
final Clan clan = player.getClan();
if ((clan != null) && (clan.getLevel() >= 3))
{
- 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);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 41938fda69..ae73426ffa 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1015,16 +1015,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
@@ -1032,7 +1032,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);
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index c4caf02343..993dbc3892 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -392,7 +392,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());
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 91a2b46047..5d3c284100 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 411c71344c..2b7af6518f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -203,7 +203,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);
@@ -266,7 +266,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);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index d4c1bad3b7..bc2857e475 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -88,7 +88,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket
}
// Reduce reputation.
- playerClan.takeReputationScore(500, true);
+ playerClan.takeReputationScore(500);
ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (Player member : playerClan.getOnlineMembers(0))
{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 7588b315c7..cdd4d1e894 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_Classic_Interlude/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_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
@@ -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_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 57182a418f..ff17f694f3 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
index 8af80a7e5d..cb01958bb0 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2371,15 +2371,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
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 4552b070ca..ab69ac3799 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -349,7 +349,7 @@ public class PlayableStat extends CreatureStat
reputation = (int) Math.ceil(reputation * Config.LVL_OBTAINED_REP_SCORE_MULTIPLIER);
- clan.addReputationScore(reputation, true);
+ clan.addReputationScore(reputation);
for (ClanMember member : clan.getMembers())
{
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
index a4406d2d06..3c995031df 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -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:
*
@@ -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);
@@ -1895,11 +1873,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
}
}
@@ -2093,17 +2071,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))
{
@@ -2137,11 +2115,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index a664008e73..abd2b2d94b 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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(500, true);
+ cancelor.takeReputationScore(500);
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());
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 7929fbbe60..92e8dc4386 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -906,7 +906,7 @@ public class Hero
final Clan clan = player.getClan();
if ((clan != null) && (clan.getLevel() >= 3))
{
- 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);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 41938fda69..ae73426ffa 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1015,16 +1015,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
@@ -1032,7 +1032,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);
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index b0bc947197..55ce5f16e0 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -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());
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 8e5a5e04ff..dcf66ad00e 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -305,7 +305,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);
@@ -425,7 +425,7 @@ public class MultiSellChoose implements IClientIncomingPacket
{
if (clan != null)
{
- clan.addReputationScore((int) totalCount, true);
+ clan.addReputationScore((int) totalCount);
}
break;
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 45cab77cbf..a1f5312090 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -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);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index d4c1bad3b7..bc2857e475 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -88,7 +88,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket
}
// Reduce reputation.
- playerClan.takeReputationScore(500, true);
+ playerClan.takeReputationScore(500);
ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (Player member : playerClan.getOnlineMembers(0))
{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 7588b315c7..cdd4d1e894 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/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_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/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_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index cc195a45f7..7fe48b0a91 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
index 3c1680b732..0c6bdaa9d7 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2388,15 +2388,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
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 6f5734a1d7..14b5ab1db6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -353,7 +353,7 @@ public class PlayableStat extends CreatureStat
reputation = (int) Math.ceil(reputation * Config.LVL_OBTAINED_REP_SCORE_MULTIPLIER);
- clan.addReputationScore(reputation, true);
+ clan.addReputationScore(reputation);
for (ClanMember member : clan.getMembers())
{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 6e73bb2495..38c26c975e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -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:
*
@@ -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);
@@ -1895,11 +1873,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
}
}
@@ -2093,17 +2071,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))
{
@@ -2137,11 +2115,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 402dbb60f2..74e1e27b88 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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(500, true);
+ cancelor.takeReputationScore(500);
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());
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 44a87d7c08..212d62487c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -931,7 +931,7 @@ public class Hero
final Clan clan = player.getClan();
if ((clan != null) && (clan.getLevel() >= 3))
{
- 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);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 02055201c4..a698f0de45 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1015,16 +1015,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
@@ -1032,7 +1032,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);
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 32f218524f..fa9c251da4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -392,7 +392,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());
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index bca34e2fc1..f709f27e1c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -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;
}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index d3e75ee001..a37e21c83c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -203,7 +203,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);
@@ -266,7 +266,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);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index 8ba26f938b..85f84b3cd1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -88,7 +88,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket
}
// Reduce reputation.
- playerClan.takeReputationScore(500, true);
+ playerClan.takeReputationScore(500);
ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (Player member : playerClan.getOnlineMembers(0))
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 82f3148edd..ddde1c825d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
@@ -189,7 +189,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_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/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_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index cc195a45f7..7fe48b0a91 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 05255db333..36bee5df13 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -300,7 +300,7 @@ public class Attackable extends Npc
{
if ((killer.getClan() != null) && (Rnd.get(100) < 2))
{
- killer.getClan().addExp(killer.getObjectId(), 1, true);
+ killer.getClan().addExp(killer.getObjectId(), 1);
}
// Delayed notification
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
index 55d7b17fd6..a398aea3de 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2419,15 +2419,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
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 6f5734a1d7..14b5ab1db6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -353,7 +353,7 @@ public class PlayableStat extends CreatureStat
reputation = (int) Math.ceil(reputation * Config.LVL_OBTAINED_REP_SCORE_MULTIPLIER);
- clan.addReputationScore(reputation, true);
+ clan.addReputationScore(reputation);
for (ClanMember member : clan.getMembers())
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 757283994a..b70e45afb4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -965,28 +965,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:
*
@@ -1131,7 +1109,7 @@ public class Clan implements IIdentifiable, INamable
setAllyCrestId(clanData.getInt("ally_crest_id"));
_exp = clanData.getInt("exp");
- 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);
@@ -1917,11 +1895,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
}
}
@@ -2115,17 +2093,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))
{
@@ -2159,11 +2137,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
@@ -3110,7 +3085,7 @@ public class Clan implements IIdentifiable, INamable
return _exp;
}
- public void addExp(int objId, int value, boolean save)
+ public void addExp(int objId, int value)
{
_exp += value;
broadcastToOnlineMembers(new ExPledgeV3Info(_exp, getRank(), getNotice(), isNoticeEnabled()));
@@ -3120,13 +3095,9 @@ public class Clan implements IIdentifiable, INamable
changeLevel(_level + 1);
}
- if (save)
- {
- final int contribution = getClanContribution(objId);
- setClanContribution(objId, contribution + value);
- setClanContributionWeekly(objId, contribution + value);
- updateClanInDB();
- }
+ final int contribution = getClanContribution(objId);
+ setClanContribution(objId, contribution + value);
+ setClanContributionWeekly(objId, contribution + value);
}
public void setExp(int objId, int value)
@@ -3137,6 +3108,7 @@ public class Clan implements IIdentifiable, INamable
final int contribution = getClanContribution(objId);
setClanContribution(objId, contribution + value);
setClanContributionWeekly(objId, contribution + value);
+
updateClanInDB();
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 402dbb60f2..74e1e27b88 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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(500, true);
+ cancelor.takeReputationScore(500);
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());
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 44a87d7c08..212d62487c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -931,7 +931,7 @@ public class Hero
final Clan clan = player.getClan();
if ((clan != null) && (clan.getLevel() >= 3))
{
- 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);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 02055201c4..a698f0de45 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1015,16 +1015,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
@@ -1032,7 +1032,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);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 32f218524f..fa9c251da4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -392,7 +392,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());
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 0cc8fa64de..44ab115ab0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -339,7 +339,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);
@@ -464,7 +464,7 @@ public class MultiSellChoose implements IClientIncomingPacket
{
if (clan != null)
{
- clan.addReputationScore((int) totalCount, true);
+ clan.addReputationScore((int) totalCount);
}
break;
}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index d3e75ee001..a37e21c83c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -203,7 +203,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);
@@ -266,7 +266,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);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index 8ba26f938b..85f84b3cd1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -88,7 +88,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket
}
// Reduce reputation.
- playerClan.takeReputationScore(500, true);
+ playerClan.takeReputationScore(500);
ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (Player member : playerClan.getOnlineMembers(0))
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyDelete.java
index e773d46fc1..59096b87ee 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyDelete.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyDelete.java
@@ -90,7 +90,7 @@ public class RequestExPledgeEnemyDelete implements IClientIncomingPacket
}
// Reduce reputation.
- playerClan.takeReputationScore(500, true);
+ playerClan.takeReputationScore(500);
ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (Player member : playerClan.getOnlineMembers(0))
{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationRequest.java
index 7a4b323122..1349c53fcf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationRequest.java
@@ -65,7 +65,7 @@ public class RequestExPledgeDonationRequest implements IClientIncomingPacket
{
if (player.reduceAdena("pledge donation", 10000, null, true))
{
- clan.addExp(player.getObjectId(), 9, true);
+ clan.addExp(player.getObjectId(), 9);
}
else
{
@@ -79,7 +79,7 @@ public class RequestExPledgeDonationRequest implements IClientIncomingPacket
{
if (player.getInventory().destroyItemByItemId("pledge donation", Inventory.LCOIN_ID, 100, player, null) != null)
{
- clan.addExp(player.getObjectId(), 30, true);
+ clan.addExp(player.getObjectId(), 30);
player.setHonorCoins(player.getHonorCoins() + 100);
}
else
@@ -99,7 +99,7 @@ public class RequestExPledgeDonationRequest implements IClientIncomingPacket
{
if (player.getInventory().destroyItemByItemId("pledge donation", Inventory.LCOIN_ID, 500, player, null) != null)
{
- clan.addExp(player.getObjectId(), 150, true);
+ clan.addExp(player.getObjectId(), 150);
player.setHonorCoins(player.getHonorCoins() + 500);
}
else
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
index 82f3148edd..ddde1c825d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java
@@ -189,7 +189,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_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
index e55914a26b..bd2f15869b 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/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_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index cc195a45f7..7fe48b0a91 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -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);
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 05255db333..36bee5df13 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -300,7 +300,7 @@ public class Attackable extends Npc
{
if ((killer.getClan() != null) && (Rnd.get(100) < 2))
{
- killer.getClan().addExp(killer.getObjectId(), 1, true);
+ killer.getClan().addExp(killer.getObjectId(), 1);
}
// Delayed notification
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
index e993f9443d..1fd391616c 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -2419,15 +2419,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
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 6f5734a1d7..14b5ab1db6 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -353,7 +353,7 @@ public class PlayableStat extends CreatureStat
reputation = (int) Math.ceil(reputation * Config.LVL_OBTAINED_REP_SCORE_MULTIPLIER);
- clan.addReputationScore(reputation, true);
+ clan.addReputationScore(reputation);
for (ClanMember member : clan.getMembers())
{
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 757283994a..b70e45afb4 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -965,28 +965,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:
*
@@ -1131,7 +1109,7 @@ public class Clan implements IIdentifiable, INamable
setAllyCrestId(clanData.getInt("ally_crest_id"));
_exp = clanData.getInt("exp");
- 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);
@@ -1917,11 +1895,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
}
}
@@ -2115,17 +2093,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))
{
@@ -2159,11 +2137,8 @@ public class Clan implements IIdentifiable, INamable
{
_reputationScore = -100000000;
}
+
broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
- if (save)
- {
- updateInDB();
- }
}
public int getReputationScore()
@@ -3110,7 +3085,7 @@ public class Clan implements IIdentifiable, INamable
return _exp;
}
- public void addExp(int objId, int value, boolean save)
+ public void addExp(int objId, int value)
{
_exp += value;
broadcastToOnlineMembers(new ExPledgeV3Info(_exp, getRank(), getNotice(), isNoticeEnabled()));
@@ -3120,13 +3095,9 @@ public class Clan implements IIdentifiable, INamable
changeLevel(_level + 1);
}
- if (save)
- {
- final int contribution = getClanContribution(objId);
- setClanContribution(objId, contribution + value);
- setClanContributionWeekly(objId, contribution + value);
- updateClanInDB();
- }
+ final int contribution = getClanContribution(objId);
+ setClanContribution(objId, contribution + value);
+ setClanContributionWeekly(objId, contribution + value);
}
public void setExp(int objId, int value)
@@ -3137,6 +3108,7 @@ public class Clan implements IIdentifiable, INamable
final int contribution = getClanContribution(objId);
setClanContribution(objId, contribution + value);
setClanContributionWeekly(objId, contribution + value);
+
updateClanInDB();
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 402dbb60f2..74e1e27b88 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -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(500, true);
+ cancelor.takeReputationScore(500);
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());
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
index 44a87d7c08..212d62487c 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/Hero.java
@@ -931,7 +931,7 @@ public class Hero
final Clan clan = player.getClan();
if ((clan != null) && (clan.getLevel() >= 3))
{
- 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);
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 02055201c4..a698f0de45 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1015,16 +1015,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
@@ -1032,7 +1032,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);
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Fort.java
index d7a7c0ff7c..a52babda86 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -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);
}
}
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 32f218524f..fa9c251da4 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -392,7 +392,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());
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 0cc8fa64de..44ab115ab0 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -339,7 +339,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);
@@ -464,7 +464,7 @@ public class MultiSellChoose implements IClientIncomingPacket
{
if (clan != null)
{
- clan.addReputationScore((int) totalCount, true);
+ clan.addReputationScore((int) totalCount);
}
break;
}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index d3e75ee001..a37e21c83c 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -203,7 +203,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);
@@ -266,7 +266,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);
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index 8ba26f938b..85f84b3cd1 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -88,7 +88,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket
}
// Reduce reputation.
- playerClan.takeReputationScore(500, true);
+ playerClan.takeReputationScore(500);
ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (Player member : playerClan.getOnlineMembers(0))
{
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyDelete.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyDelete.java
index e773d46fc1..59096b87ee 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyDelete.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyDelete.java
@@ -90,7 +90,7 @@ public class RequestExPledgeEnemyDelete implements IClientIncomingPacket
}
// Reduce reputation.
- playerClan.takeReputationScore(500, true);
+ playerClan.takeReputationScore(500);
ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (Player member : playerClan.getOnlineMembers(0))
{
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationRequest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationRequest.java
index 7a4b323122..1349c53fcf 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationRequest.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationRequest.java
@@ -65,7 +65,7 @@ public class RequestExPledgeDonationRequest implements IClientIncomingPacket
{
if (player.reduceAdena("pledge donation", 10000, null, true))
{
- clan.addExp(player.getObjectId(), 9, true);
+ clan.addExp(player.getObjectId(), 9);
}
else
{
@@ -79,7 +79,7 @@ public class RequestExPledgeDonationRequest implements IClientIncomingPacket
{
if (player.getInventory().destroyItemByItemId("pledge donation", Inventory.LCOIN_ID, 100, player, null) != null)
{
- clan.addExp(player.getObjectId(), 30, true);
+ clan.addExp(player.getObjectId(), 30);
player.setHonorCoins(player.getHonorCoins() + 100);
}
else
@@ -99,7 +99,7 @@ public class RequestExPledgeDonationRequest implements IClientIncomingPacket
{
if (player.getInventory().destroyItemByItemId("pledge donation", Inventory.LCOIN_ID, 500, player, null) != null)
{
- clan.addExp(player.getObjectId(), 150, true);
+ clan.addExp(player.getObjectId(), 150);
player.setHonorCoins(player.getHonorCoins() + 500);
}
else