diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java index f2b82e8162..75a15e134a 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java @@ -60,6 +60,7 @@ import com.l2jserver.gameserver.model.quest.Quest; import com.l2jserver.gameserver.model.zone.ZoneId; import com.l2jserver.gameserver.network.SystemMessageId; import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList; +import com.l2jserver.gameserver.network.serverpackets.AllyCrest; import com.l2jserver.gameserver.network.serverpackets.Die; import com.l2jserver.gameserver.network.serverpackets.EtcStatusUpdate; import com.l2jserver.gameserver.network.serverpackets.ExAcquireAPSkillList; @@ -318,6 +319,11 @@ public class EnterWorld extends L2GameClientPacket { sendPacket(new PledgeCrest(activeChar.getClan().getCrestId())); } + // Show ally crest + if (activeChar.getClan().getAllyCrestId() > 0) + { + sendPacket(new AllyCrest(activeChar.getClan().getAllyCrestId())); + } } if (Config.ENABLE_VITALITY) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyCrest.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyCrest.java index 9f11f02674..faadf17516 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyCrest.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyCrest.java @@ -18,27 +18,40 @@ */ package com.l2jserver.gameserver.network.clientpackets; +import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.network.serverpackets.AllyCrest; /** - * This class ... - * @version $Revision: 1.3.4.4 $ $Date: 2005/03/27 15:29:30 $ + * @author Mobius */ public final class RequestAllyCrest extends L2GameClientPacket { private static final String _C__92_REQUESTALLYCREST = "[C] 92 RequestAllyCrest"; private int _crestId; + private int _allyId; @Override protected void readImpl() { _crestId = readD(); + _allyId = readD(); } @Override protected void runImpl() { + if (_crestId == 0) + { + return; + } + + final L2PcInstance activeChar = getClient().getActiveChar(); + if ((activeChar.getAllyId() > 0) && (activeChar.getAllyId() == _allyId)) + { + return; + } + sendPacket(new AllyCrest(_crestId)); }