|
@@ -20,6 +20,7 @@ import com.l2jserver.Config;
|
|
import com.l2jserver.gameserver.datatables.AccessLevels;
|
|
import com.l2jserver.gameserver.datatables.AccessLevels;
|
|
import com.l2jserver.gameserver.datatables.CharNameTable;
|
|
import com.l2jserver.gameserver.datatables.CharNameTable;
|
|
import com.l2jserver.gameserver.instancemanager.MailManager;
|
|
import com.l2jserver.gameserver.instancemanager.MailManager;
|
|
|
|
+import com.l2jserver.gameserver.model.BlockList;
|
|
import com.l2jserver.gameserver.model.L2AccessLevel;
|
|
import com.l2jserver.gameserver.model.L2AccessLevel;
|
|
import com.l2jserver.gameserver.model.L2ItemInstance;
|
|
import com.l2jserver.gameserver.model.L2ItemInstance;
|
|
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
|
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
|
@@ -111,12 +112,6 @@ public final class RequestSendPost extends L2GameClientPacket
|
|
if (activeChar == null)
|
|
if (activeChar == null)
|
|
return;
|
|
return;
|
|
|
|
|
|
- if (!activeChar.getFloodProtectors().getSendMail().tryPerformAction("sendmail"))
|
|
|
|
- {
|
|
|
|
- activeChar.sendPacket(new SystemMessage(SystemMessageId.CANT_FORWARD_LESS_THAN_MINUTE));
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
if (!Config.ALLOW_ATTACHMENTS)
|
|
if (!Config.ALLOW_ATTACHMENTS)
|
|
{
|
|
{
|
|
_items = null;
|
|
_items = null;
|
|
@@ -231,6 +226,18 @@ public final class RequestSendPost extends L2GameClientPacket
|
|
activeChar.sendPacket(sm);
|
|
activeChar.sendPacket(sm);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if (activeChar.isInJail())
|
|
|
|
+ {
|
|
|
|
+ activeChar.sendPacket(new SystemMessage(SystemMessageId.CANT_FORWARD_NOT_IN_PEACE_ZONE));
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (BlockList.isInBlockList(receiverId, activeChar.getObjectId()))
|
|
|
|
+ {
|
|
|
|
+ activeChar.sendPacket(new SystemMessage(SystemMessageId.C1_BLOCKED_YOU_CANNOT_MAIL).addString(_receiver));
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
|
|
if (MailManager.getInstance().getOutboxSize(activeChar.getObjectId()) >= OUTBOX_SIZE)
|
|
if (MailManager.getInstance().getOutboxSize(activeChar.getObjectId()) >= OUTBOX_SIZE)
|
|
{
|
|
{
|
|
@@ -243,6 +250,12 @@ public final class RequestSendPost extends L2GameClientPacket
|
|
activeChar.sendPacket(new SystemMessage(SystemMessageId.CANT_FORWARD_MAIL_LIMIT_EXCEEDED));
|
|
activeChar.sendPacket(new SystemMessage(SystemMessageId.CANT_FORWARD_MAIL_LIMIT_EXCEEDED));
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if (!activeChar.getFloodProtectors().getSendMail().tryPerformAction("sendmail"))
|
|
|
|
+ {
|
|
|
|
+ activeChar.sendPacket(new SystemMessage(SystemMessageId.CANT_FORWARD_LESS_THAN_MINUTE));
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
|
|
Message msg = new Message(activeChar.getObjectId(), receiverId, _isCod, _subject, _text, _reqAdena);
|
|
Message msg = new Message(activeChar.getObjectId(), receiverId, _isCod, _subject, _text, _reqAdena);
|
|
if (removeItems(activeChar, msg))
|
|
if (removeItems(activeChar, msg))
|