diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/ActionData.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/ActionData.xml index 965751da7b..56cfe5633c 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/ActionData.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/ActionData.xml @@ -63,6 +63,7 @@ + diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/MasterHandler.java index 16ba80dd06..653877d6ca 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/MasterHandler.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/MasterHandler.java @@ -239,6 +239,7 @@ import handlers.playeractions.TacticalSignUse; import handlers.playeractions.TeleportBookmark; import handlers.playeractions.UnsummonPet; import handlers.playeractions.UnsummonServitor; +import handlers.playeractions.WaitingAction; import handlers.punishmenthandlers.BanHandler; import handlers.punishmenthandlers.ChatBanHandler; import handlers.punishmenthandlers.JailHandler; @@ -687,7 +688,8 @@ public class MasterHandler TacticalSignUse.class, TeleportBookmark.class, UnsummonPet.class, - UnsummonServitor.class + UnsummonServitor.class, + WaitingAction.class } }; diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/playeractions/WaitingAction.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/playeractions/WaitingAction.java new file mode 100644 index 0000000000..d41ea8a291 --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/playeractions/WaitingAction.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.playeractions; + +import org.l2jmobius.gameserver.handler.IPlayerActionHandler; +import org.l2jmobius.gameserver.instancemanager.CastleManager; +import org.l2jmobius.gameserver.model.ActionDataHolder; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SocialAction; + +/** + * @author Index + */ +public class WaitingAction implements IPlayerActionHandler +{ + @Override + public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed) + { + final int actionId = (player.getClan() != null) && (CastleManager.getInstance().getCastleByOwner(player.getClan()) != null) ? player.isClanLeader() ? 100 : 101 : 0; + if (actionId == 0) + { + player.sendPacket(SystemMessageId.YOU_HAVE_NOT_SET_A_LIST_OF_ACTIONS_FOR_THE_WAITING_TIME); + return; + } + + player.sendPacket(new SocialAction(player.getObjectId(), actionId)); + } +} diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index a454d136c6..1cac285d14 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -100,7 +100,7 @@ public class ExBasicActionList implements IClientOutgoingPacket 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 92, 93, - 94, 96, 97, + 94, 95, 96, 97, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009,