Jelajahi Sumber

Cannot validate manor bypass.

JIV 15 tahun lalu
induk
melakukan
e5fcd3011d

+ 9 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2CastleChamberlainInstance.java

@@ -369,6 +369,15 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 			else if (command.startsWith("manor_menu_select"))
 			{// input string format:
 				// manor_menu_select?ask=X&state=Y&time=X
+				
+				if ((player.getClanPrivileges() & L2Clan.CP_CS_MANOR_ADMIN) != L2Clan.CP_CS_MANOR_ADMIN)
+				{
+					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
+					player.sendPacket(html);
+					return;
+				}
+				
 				if (CastleManorManager.getInstance().isUnderMaintenance())
 				{
 					player.sendPacket(ActionFailed.STATIC_PACKET);

+ 2 - 2
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java

@@ -160,8 +160,8 @@ public final class RequestBypassToServer extends L2GameClientPacket
 			// Navigate through Manor windows
 			else if (_command.startsWith("manor_menu_select?"))
 			{
-				if(!activeChar.validateBypass(_command))
-					return;
+				/*if(!activeChar.validateBypass(_command))
+					return;*/
 				
 				L2Object object = activeChar.getLastFolkNPC();
 				if ((object instanceof L2ManorManagerInstance || object instanceof L2CastleChamberlainInstance)