This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bool Spell::CanExecuteTriggersOnHit(uint8 effMask, SpellInfo const* spellInfo) const | |
{ | |
bool only_on_dummy = (spellInfo && (spellInfo->AttributesEx4 & SPELL_ATTR4_PROC_ONLY_ON_DUMMY)); | |
// If triggered spell has SPELL_ATTR4_PROC_ONLY_ON_DUMMY then it can only proc on a casted spell with SPELL_EFFECT_DUMMY | |
// If triggered spell doesn't have SPELL_ATTR4_PROC_ONLY_ON_DUMMY then it can NOT proc on SPELL_EFFECT_DUMMY (needs confirmation) | |
for (uint8 i = 0;i < MAX_SPELL_EFFECTS; ++i) | |
{ | |
- if ((effMask & (1 << i)) && (only_on_dummy == (m_spellInfo->Effects[i].Effect == SPELL_EFFECT_DUMMY))) | |
+ // if ((effMask & (1 << i)) && (only_on_dummy == (m_spellInfo->Effects[i].Effect == SPELL_EFFECT_DUMMY))) | |
+ if ((effMask & (1 << i)) && ((only_on_dummy == (m_spellInfo->Effects[i].Effect == SPELL_EFFECT_DUMMY)) && |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp | |
index 4eee788..e3dd391 100755 | |
--- a/src/server/game/Spells/Spell.cpp | |
+++ b/src/server/game/Spells/Spell.cpp | |
@@ -7089,9 +7089,12 @@ bool Spell::CanExecuteTriggersOnHit(uint8 effMask) const | |
// check which effects can trigger proc | |
// don't allow to proc for dummy-only spell target hits | |
// prevents triggering/procing effects twice from spells like Eviscerate | |
- for (uint8 i = 0;effMask && i < MAX_SPELL_EFFECTS; ++i) | |
+ // also prevents double proc from Envenom |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
for (MemberList::const_iterator itr = Members.begin(); itr != Members.end(); ++itr) | |
{ | |
// The player participated in enough games, update his points | |
uint32 pointsToAdd = 0; | |
if (itr->WeekGames >= requiredGames) | |
- pointsToAdd = GetPoints(itr->PersonalRating); | |
+ //pointsToAdd = GetPoints(itr->PersonalRating); | |
+ pointsToAdd = GetPoints(itr->PersonalRating) + Stats.WeekGames *3; | |
std::map<uint32, uint32>::iterator plr_itr = playerPoints.find(GUID_LOPART(itr->Guid)); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From aeddf0e48a9e87b5f17cf4af2b84157168716c2e Mon Sep 17 00:00:00 2001 | |
From: Jildor <[email protected]> | |
Date: Sun, 8 May 2011 21:50:45 +0200 | |
Subject: [PATCH] Core/Spells: Fix Harpoons (thx burnham) | |
--- | |
src/server/game/Spells/Spell.cpp | 2 ++ | |
1 files changed, 2 insertions(+), 0 deletions(-) | |
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DELETE FROM spell_proc_event WHERE entry IN (66799,66814,66815,66816,66817); | |
INSERT INTO spell_proc_event (entry, SchoolMask, SpellFamilyName, SpellFamilyMask0, SpellFamilyMask1, SpellFamilyMask2, procFlags, procEx, ppmRate, CustomChance, Cooldown) VALUES | |
(66799, 5, 15, 4194304, 0, 0, 0, 0, 0, 100, 0), -- Rank1 | |
(66814, 5, 15, 4194304, 0, 0, 0, 0, 0, 100, 0), -- Rank2 | |
(66815, 5, 15, 4194304, 0, 0, 0, 0, 0, 100, 0), -- Rank3 | |
(66816, 5, 15, 4194304, 0, 0, 0, 0, 0, 100, 0), -- Rank4 | |
(66817, 5, 15, 4194304, 0, 0, 0, 0, 0, 100, 0); -- Rank5 |
NewerOlder