diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
index 5672da42e06f0867cdde3023a91ff70db3deaa20..5126450f40230e92101adf11f3fa06096615b590 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
@@ -147,7 +147,7 @@ public final class WyvernManager extends AbstractNpcAI
final Fort fort = npc.getFort();
if ((player.getClan() != null) && (fort != null) && (fort.getOwnerClan() != null))
{
- return (player.isClanLeader() && (player.getClanId() == npc.getFort().getOwnerClan().getClanId()));
+ return (player.isClanLeader() && (player.getClanId() == npc.getFort().getOwnerClan().getId()));
}
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java
index 93d43ad7fdf23f4e8bfd625f5876894f763badd6..7d97aa865db3e1681588f7dac3cb5d74d0615253 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java
@@ -87,7 +87,7 @@ public final class DevastatedCastle extends ClanHallSiegeEngine
if ((clan != null) && checkIsAttacker(clan))
{
- final int id = clan.getClanId();
+ final int id = clan.getId();
if (_damageToGustav.containsKey(id))
{
int newDamage = _damageToGustav.get(id);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java
index 9a482bf0c3490802d842af1e88e86b02dfc031b9..567b2efbae00e336d1c244d2bbe3ee945b834346 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java
@@ -98,7 +98,7 @@ public final class FortressOfTheDead extends ClanHallSiegeEngine
if ((clan != null) && checkIsAttacker(clan))
{
- final int id = clan.getClanId();
+ final int id = clan.getId();
if ((id > 0) && _damageToLidia.containsKey(id))
{
int newDamage = _damageToLidia.get(id);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
index be252dc61e12969fd7d60670cba551578949b407..d5b268991ea78d694d1bb5af671adae1cc46108a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -388,7 +388,7 @@ public class RainbowSpringsChateau extends Quest
{
html = "messenger_yetti014.htm";
}
- else if (_warDecreesCount.containsKey(clan.getClanId()))
+ else if (_warDecreesCount.containsKey(clan.getId()))
{
html = "messenger_yetti013.htm";
}
@@ -406,9 +406,9 @@ public class RainbowSpringsChateau extends Quest
else
{
long count = warDecrees.getCount();
- _warDecreesCount.put(clan.getClanId(), count);
+ _warDecreesCount.put(clan.getId(), count);
player.destroyItem("Rainbow Springs Registration", warDecrees, npc, true);
- updateAttacker(clan.getClanId(), count, false);
+ updateAttacker(clan.getId(), count, false);
html = "messenger_yetti009.htm";
}
}
@@ -418,7 +418,7 @@ public class RainbowSpringsChateau extends Quest
{
html = "messenger_yetti010.htm";
}
- else if (!_warDecreesCount.containsKey(clan.getClanId()))
+ else if (!_warDecreesCount.containsKey(clan.getId()))
{
html = "messenger_yetti016.htm";
}
@@ -428,17 +428,17 @@ public class RainbowSpringsChateau extends Quest
}
else
{
- updateAttacker(clan.getClanId(), 0, true);
+ updateAttacker(clan.getId(), 0, true);
html = "messenger_yetti018.htm";
}
break;
case "unregister":
if (_rainbow.isRegistering())
{
- if (_warDecreesCount.containsKey(clan.getClanId()))
+ if (_warDecreesCount.containsKey(clan.getId()))
{
- player.addItem("Rainbow Spring unregister", WAR_DECREES, _warDecreesCount.get(clan.getClanId()) / 2, npc, true);
- _warDecreesCount.remove(clan.getClanId());
+ player.addItem("Rainbow Spring unregister", WAR_DECREES, _warDecreesCount.get(clan.getId()) / 2, npc, true);
+ _warDecreesCount.remove(clan.getId());
html = "messenger_yetti019.htm";
}
else
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
index 75d66b7a88560151e87bbd4b933de19da1f195c0..e705951a82c9ff28fea4d2402e5879b830e19851 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
@@ -199,7 +199,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
{
html = "messenger_clanalreadyregistered.htm";
}
- else if (_hall.getOwnerId() == clan.getClanId())
+ else if (_hall.getOwnerId() == clan.getId())
{
html = "messenger_curownermessage.htm";
}
@@ -214,7 +214,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
if (player.destroyItemByItemId(_hall.getName() + " Siege", QUEST_REWARD, 1, npc, false)) // Quest passed
{
registerClan(clan);
- html = getFlagHtml(_data.get(clan.getClanId()).flag);
+ html = getFlagHtml(_data.get(clan.getId()).flag);
}
else
{
@@ -227,7 +227,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
if (player.reduceAdena(qn + " Siege", 200000, npc, false)) // Fee payed
{
registerClan(clan);
- html = getFlagHtml(_data.get(clan.getClanId()).flag);
+ html = getFlagHtml(_data.get(clan.getId()).flag);
}
else
{
@@ -244,7 +244,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
{
html = "messenger_onlyleaderselectally.htm";
}
- else if (!_data.containsKey(clan.getClanId()))
+ else if (!_data.containsKey(clan.getId()))
{
html = "messenger_clannotregistered.htm";
}
@@ -264,8 +264,8 @@ public abstract class FlagWar extends ClanHallSiegeEngine
}
if ((id > 0) && ((html = getAllyHtml(id)) != null))
{
- _data.get(clan.getClanId()).npc = id;
- saveNpc(id, clan.getClanId());
+ _data.get(clan.getId()).npc = id;
+ saveNpc(id, clan.getId());
}
}
else
@@ -282,7 +282,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
{
html = "messenger_clannotregistered.htm";
}
- else if ((cd = _data.get(clan.getClanId())) == null)
+ else if ((cd = _data.get(clan.getId())) == null)
{
html = "messenger_notclannotleader.htm";
}
@@ -306,19 +306,19 @@ public abstract class FlagWar extends ClanHallSiegeEngine
{
html = "messenger_registrationpassed.htm";
}
- else if (!_data.containsKey(clan.getClanId()))
+ else if (!_data.containsKey(clan.getId()))
{
html = "messenger_notclannotleader.htm";
}
- else if (_data.get(clan.getClanId()).players.size() >= 18)
+ else if (_data.get(clan.getId()).players.size() >= 18)
{
html = "messenger_clanqueuefull.htm";
}
else
{
- ClanData data = _data.get(clan.getClanId());
+ ClanData data = _data.get(clan.getId());
data.players.add(player.getObjectId());
- saveMember(clan.getClanId(), player.getObjectId());
+ saveMember(clan.getId(), player.getObjectId());
if (data.npc == 0)
{
html = "messenger_leaderdidnotchooseyet.htm";
@@ -699,7 +699,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
private void registerClan(L2Clan clan)
{
- final int clanId = clan.getClanId();
+ final int clanId = clan.getId();
L2SiegeClan sc = new L2SiegeClan(clanId, SiegeClanType.ATTACKER);
getAttackers().put(clanId, sc);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java
index 725ffae471c8068837418662144374456647d46a..f1b20de54b8c7853c0c048e80567e7586a93a79a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java
@@ -127,7 +127,7 @@ public class AdminClan implements IAdminCommandHandler
sb.append("<tr>");
sb.append("<td>" + clan.getName() + "</td>");
sb.append("<td>" + clan.getNewLeaderName() + "</td>");
- sb.append("<td><a action=\"bypass -h admin_clan_force_pending " + clan.getClanId() + "\">Force</a></td>");
+ sb.append("<td><a action=\"bypass -h admin_clan_force_pending " + clan.getId() + "\">Force</a></td>");
sb.append("</tr>");
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index fb7951f64a885439732d9901f16d84c71e001b62..257e1d363f2a867ece5bcc0e308ee2d377cc04d0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -390,7 +390,7 @@ public class AdminEditChar implements IAdminCommandHandler
player.setBaseClass(classidval);
}
String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
- player.store();
+ player.storeMe();
player.sendMessage("A GM changed your class to " + newclass + ".");
player.broadcastUserInfo();
activeChar.sendMessage(player.getName() + " is a " + newclass + ".");
@@ -454,7 +454,7 @@ public class AdminEditChar implements IAdminCommandHandler
return false;
}
player.setName(val);
- player.store();
+ player.storeMe();
activeChar.sendMessage("Changed name to " + val);
player.sendMessage("Your name has been changed by a GM.");
@@ -1076,7 +1076,7 @@ public class AdminEditChar implements IAdminCommandHandler
player.setPkKills(pkkillsval);
// Save the changed parameters to the database.
- player.store();
+ player.storeMe();
StatusUpdate su = new StatusUpdate(player);
su.addAttribute(StatusUpdate.CUR_HP, hpval);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java
index 930af8ac329b5d31da0dcfa4017639940a011f0e..9106e69de9f941aa8ca31e7de0eb3d79890d0954 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java
@@ -115,7 +115,7 @@ public class SummonPet extends L2Effect
if (!pet.isRespawned())
{
- pet.store();
+ pet.storeMe();
}
player.setPet(pet);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java
index e76b3b5452ecff36e474d4f49cad326cd11c78c8..b9e1acfb9a59f19586b72250a0d7ad9085349094 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java
@@ -88,8 +88,8 @@ public class ClanWarsList implements IUserCommandHandler
try (PreparedStatement ps = con.prepareStatement(query))
{
- ps.setInt(1, clan.getClanId());
- ps.setInt(2, clan.getClanId());
+ ps.setInt(1, clan.getId());
+ ps.setInt(2, clan.getId());
SystemMessage sm;
try (ResultSet rs = ps.executeQuery())
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/SetVCmd.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/SetVCmd.java
index 82fc0cfb335497aa8186f11ae0e6e7330f6bc6be..d18249aa39a15815311f274475f03f46bce5b48a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/SetVCmd.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/SetVCmd.java
@@ -47,7 +47,7 @@ public class SetVCmd implements IVoicedCommandHandler
}
final L2PcInstance player = activeChar.getTarget().getActingPlayer();
- if ((activeChar.getClan() == null) || (player.getClan() == null) || (activeChar.getClan().getClanId() != player.getClan().getClanId()))
+ if ((activeChar.getClan() == null) || (player.getClan() == null) || (activeChar.getClan().getId() != player.getClan().getId()))
{
return false;
}