diff options
| author | gvcoman <none@none> | 2008-11-21 14:34:05 -0500 |
|---|---|---|
| committer | gvcoman <none@none> | 2008-11-21 14:34:05 -0500 |
| commit | ae8a27bbb758dd2485d9bea14ccd8b892f626371 (patch) | |
| tree | 213402aa6ce31963a4a329cbb261fd88db6a0bdd /src/game/Mail.cpp | |
| parent | 837ce55de88e33825eb66814d07d33c1f869f7a7 (diff) | |
| parent | 71707df1dec2aa77864d9a853c34108bb6021138 (diff) | |
Merged commit 269 (5f0e38da128a).
--HG--
branch : trunk
Diffstat (limited to 'src/game/Mail.cpp')
| -rw-r--r-- | src/game/Mail.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp index d91206bf6d9..6605cc78057 100644 --- a/src/game/Mail.cpp +++ b/src/game/Mail.cpp @@ -10,12 +10,12 @@ * * 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 + * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "Mail.h" @@ -187,18 +187,17 @@ 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; - } + 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); |
