aboutsummaryrefslogtreecommitdiff
path: root/src/game/Mail.cpp
diff options
context:
space:
mode:
authorKingPin <none@none>2008-11-02 16:53:46 -0600
committerKingPin <none@none>2008-11-02 16:53:46 -0600
commitd5beb2bbe97afa0e50df8a2cef49bcac4a607f4a (patch)
tree4ce9fec826220b2476406e38915a15b6d00a4ce1 /src/game/Mail.cpp
parent6633d3c680d4f75d743f705e9b26278674f11ee0 (diff)
[svn] *Implement new player conditions CONDITION_NO_AURA, CONDITION_ACTIVE_EVENT
* Default behaviour of pets for creatures changed to REACT_DEFENSIVE * Disallowed sending wrapped items as COD * Prevent loading and saving single target auras for pet in same way as already implemented for player * Correctly limit use some flask types to zones. * Fixed extracting common.MPQ under *nix * Many small xleanups and fixes. ** mangos merge rev. TEST REV so be careful of creepy crawly bugs! --HG-- branch : trunk
Diffstat (limited to 'src/game/Mail.cpp')
-rw-r--r--src/game/Mail.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp
index f79a4861b52..de92fdbc936 100644
--- a/src/game/Mail.cpp
+++ b/src/game/Mail.cpp
@@ -187,11 +187,18 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
pl->SendMailResult(0, 0, MAIL_ERR_INTERNAL_ERROR);
return;
}
+
if (mailItem.item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_CONJURED) || mailItem.item->GetUInt32Value(ITEM_FIELD_DURATION))
{
pl->SendMailResult(0, 0, MAIL_ERR_INTERNAL_ERROR);
return;
}
+
+ if(COD && mailItem.item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_WRAPPED))
+ {
+ pl->SendMailResult(0, 0, MAIL_ERR_CANT_SEND_WRAPPED_COD);
+ return;
+ }
}
}
pl->SendMailResult(0, 0, MAIL_OK);