pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EQEmu/Server

Browse Source
This commit is contained in:
Uleat
2014-11-14 17:58:12 -05:00
parent 8e20f3e7dc 5434c47d1f
commit e02e6099aa
5 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client_packet.cpp
+2 -2
View File
@@ -3770,7 +3770,7 @@ void Client::Handle_OP_BlockedBuffs(const EQApplicationPacket *app)
for (unsigned int i = 0; i < BLOCKED_BUFF_COUNT; ++i)
{
if ((bbs->SpellID[i] > 0) && IsBeneficialSpell(bbs->SpellID[i]))
if ((IsValidSpell(bbs->SpellID[i])) && IsBeneficialSpell(bbs->SpellID[i]) && !spells[bbs->SpellID[i]].no_block)
{
if (BlockedBuffs->find(bbs->SpellID[i]) == BlockedBuffs->end())
BlockedBuffs->insert(bbs->SpellID[i]);
@@ -3818,7 +3818,7 @@ void Client::Handle_OP_BlockedBuffs(const EQApplicationPacket *app)
for (unsigned int i = 0; i < BLOCKED_BUFF_COUNT; ++i)
{
if (!IsBeneficialSpell(bbs->SpellID[i]))
if (!IsValidSpell(bbs->SpellID[i]) || !IsBeneficialSpell(bbs->SpellID[i]) || spells[bbs->SpellID[i]].no_block)
continue;
if ((BlockedBuffs->size() < BLOCKED_BUFF_COUNT) && (BlockedBuffs->find(bbs->SpellID[i]) == BlockedBuffs->end()))
zone/string_ids.h
+1
View File
@@ -299,6 +299,7 @@
#define SENTINEL_TRIG_YOU 6724 //You have triggered your sentinel.
#define SENTINEL_TRIG_OTHER 6725 //%1 has triggered your sentinel.
#define IDENTIFY_SPELL 6765 //Item Lore: %1.
#define BUFF_NOT_BLOCKABLE 7608 //You cannot block this effect.
#define LDON_DONT_KNOW_TRAPPED 7552 //You do not know if this object is trapped.
#define LDON_HAVE_DISARMED 7553 //You have disarmed %1!
#define LDON_ACCIDENT_SETOFF 7554 //You accidentally set off the trap!