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

Updated clan privileges to match latest client.

Browse Source 
Contributed by CostyKiller.
This commit is contained in:
MobiusDevelopment
2022-05-11 10:06:51 +00:00
parent ea80c84027
commit 8d30fcb7d0
105 changed files with 413 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java
View File

@@ -185,7 +185,7 @@ public class FortManager extends Merchant
else if (actualCommand.equalsIgnoreCase("operate_door")) // door
// control
{
if (player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR))
if (player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS))
{
if (!val.isEmpty())
{
@@ -230,7 +230,7 @@ public class FortManager extends Merchant
else if (actualCommand.equalsIgnoreCase("manage_vault"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
if (player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE))
if (player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH))
{
if (val.equalsIgnoreCase("deposit"))
{
@@ -320,7 +320,7 @@ public class FortManager extends Merchant
}
else if (actualCommand.equalsIgnoreCase("manage"))
{
if (player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS))
if (player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS))
{
if (val.equalsIgnoreCase("recovery"))
{
@@ -995,7 +995,7 @@ public class FortManager extends Merchant
private void showVaultWindowWithdraw(Player player)
{
if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE))
if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH))
{
player.sendPacket(ActionFailed.STATIC_PACKET);
player.setActiveWarehouse(player.getClan().getWarehouse());

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java
View File

@@ -2040,7 +2040,7 @@ public class Clan implements IIdentifiable, INamable
{
return false;
}
if (!player.hasClanPrivilege(ClanPrivilege.CL_JOIN_CLAN))
if (!player.hasClanPrivilege(ClanPrivilege.CL_INVITE))
{
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
return false;

44
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java
View File

@@ -25,35 +25,35 @@ public enum ClanPrivilege
{
/** dummy entry */
DUMMY,
/** Privilege to join clan */
CL_JOIN_CLAN,
/** Privilege to give a title */
CL_GIVE_TITLE,
/** Privilege to view warehouse content */
CL_VIEW_WAREHOUSE,
/** Privilege to manage clan ranks */
/** System Privileges */
CL_INVITE,
CL_MANAGE_TITLES,
CL_WAREHOUSE_SEARCH,
CL_MANAGE_RANKS,
CL_PLEDGE_WAR,
CL_CLAN_WAR,
CL_DISMISS,
/** Privilege to register clan crest */
CL_REGISTER_CREST,
CL_APPRENTICE,
CL_TROOPS_FAME,
CL_SUMMON_AIRSHIP,
/** Privilege to open a door */
CH_OPEN_DOOR,
CH_OTHER_RIGHTS,
CL_EDIT_CREST,
CL_USE_FUNCTIONS,
CL_SETTINGS,
CL_THRONE_OF_HEROES,
/** Clan Hall Privileges */
CH_ENTRY_EXIT_RIGHTS,
CH_USE_FUNCTIONS,
CH_AUCTION,
CH_DISMISS,
CH_SET_FUNCTIONS,
CS_OPEN_DOOR,
CS_MANOR_ADMIN,
CS_MANAGE_SIEGE,
CH_SETTTINGS,
/** Castle/Fortress Privileges */
CS_ENTRY_EXIT_RIGHTS,
CS_SIEGE_WAR,
CS_USE_FUNCTIONS,
CS_SETTINGS,
CS_DISMISS,
CS_TAXES,
CS_MANAGE_TAXES,
CS_MERCENARIES,
CS_SET_FUNCTIONS;
CS_MANOR_ADMIN;
public int getBitmask()
{

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -183,7 +183,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
}
case SUBPLEDGE:
{
if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME))
if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS))
{
return;
}

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
View File

@@ -113,7 +113,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket
}
case SUBPLEDGE:
{
if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME))
if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS))
{
return;
}

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
View File

@@ -75,7 +75,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket
return;
}
if (!player.hasClanPrivilege(ClanPrivilege.CL_REGISTER_CREST))
if (!player.hasClanPrivilege(ClanPrivilege.CL_EDIT_CREST))
{
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
return;

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
View File

@@ -55,7 +55,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
else
{
// Can the player change/give a title?
if (!player.hasClanPrivilege(ClanPrivilege.CL_GIVE_TITLE))
if (!player.hasClanPrivilege(ClanPrivilege.CL_MANAGE_TITLES))
{
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
return;

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
View File

@@ -52,7 +52,7 @@ public class RequestJoinSiege implements IClientIncomingPacket
return;
}
if (!player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE))
if (!player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR))
{
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
return;

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
View File

@@ -65,7 +65,7 @@ public class RequestPledgePower implements IClientIncomingPacket
// Clan war, right to dismiss, set functions
// Auction, manage taxes, attack/defend registration, mercenary management
// => Leaves only CP_CL_VIEW_WAREHOUSE, CP_CH_OPEN_DOOR, CP_CS_OPEN_DOOR?
_privs &= ClanPrivilege.CL_VIEW_WAREHOUSE.getBitmask() | ClanPrivilege.CH_OPEN_DOOR.getBitmask() | ClanPrivilege.CS_OPEN_DOOR.getBitmask();
_privs &= ClanPrivilege.CL_WAREHOUSE_SEARCH.getBitmask() | ClanPrivilege.CH_ENTRY_EXIT_RIGHTS.getBitmask() | ClanPrivilege.CS_ENTRY_EXIT_RIGHTS.getBitmask();
}
player.getClan().setRankPrivs(_rank, _privs);
}

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java
View File

@@ -54,7 +54,7 @@ public class RequestPledgeSetAcademyMaster implements IClientIncomingPacket
return;
}
if (!player.hasClanPrivilege(ClanPrivilege.CL_APPRENTICE))
if (!player.hasClanPrivilege(ClanPrivilege.CL_DISMISS))
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_RIGHT_TO_DISMISS_AN_APPRENTICE);
return;

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java
View File

@@ -80,7 +80,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket
return;
}
if (!player.hasClanPrivilege(ClanPrivilege.CL_REGISTER_CREST))
if (!player.hasClanPrivilege(ClanPrivilege.CL_EDIT_CREST))
{
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
return;

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@@ -63,7 +63,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
else if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR))
{
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
player.sendPacket(ActionFailed.STATIC_PACKET);

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -68,7 +68,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket
}
// Check if player who does the request has the correct rights to do it
if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR))
{
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
return;

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
View File

@@ -72,7 +72,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR))
else if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR))
{
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
player.sendPacket(ActionFailed.STATIC_PACKET);

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
View File

@@ -103,7 +103,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
if (Config.ALT_MEMBERS_CAN_WITHDRAW_FROM_CLANWH)
{
if ((warehouse instanceof ClanWarehouse) && !player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE))
if ((warehouse instanceof ClanWarehouse) && !player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH))
{
return;
}