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 4cc97f57cc4baf373ee66710ffd43075b49321c7 Mon Sep 17 00:00:00 2001 | |
From: Roux Patrick-Edouard <[email protected]> | |
Date: Fri, 1 Sep 2017 21:27:34 +0200 | |
Subject: [PATCH] [SpellAura] Dose flame touched aura on flame sear | |
Flame sear dots should add stacks of Flame Touched debuff every second. | |
--- | |
.../sunwell_plateau/boss_eredar_twins.cpp | 63 ++++------------------ | |
src/game/Spells/UnitAuraProcHandler.cpp | 49 +++++++++++++++-- | |
2 files changed, 55 insertions(+), 57 deletions(-) |
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
void Unit::RemoveAurasOnCast(SpellEntry const* castedSpellEntry) | |
{ | |
for (SpellAuraHolderMap::iterator iter = m_spellAuraHolders.begin(); iter != m_spellAuraHolders.end();) | |
{ | |
SpellAuraHolder* holder = iter->second; | |
SpellEntry const* spellEntry = holder->GetSpellProto(); | |
bool removeThisHolder = false; | |
if (spellEntry->AuraInterruptFlags & AURA_INTERRUPT_FLAG_UNK2) | |
{ |
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/game/ChatHandler.cpp b/src/game/ChatHandler.cpp | |
index 3bda8d9..c8715c9 100644 | |
--- a/src/game/ChatHandler.cpp | |
+++ b/src/game/ChatHandler.cpp | |
@@ -53,6 +53,22 @@ bool WorldSession::processChatmessageFurtherAfterSecurityChecks(std::string& msg | |
KickPlayer(); | |
return false; | |
} | |
+ | |
+ // check if the message start with /script wish is not permitted in any case |
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/game/Unit.cpp b/src/game/Unit.cpp | |
index f097131..6a382c5 100644 | |
--- a/src/game/Unit.cpp | |
+++ b/src/game/Unit.cpp | |
@@ -8569,33 +8569,56 @@ void Unit::SetSpeedRate(UnitMoveType mtype, float rate, bool forced) | |
m_speed_rate[mtype] = rate; | |
propagateSpeedChange(); | |
- const uint16 SetSpeed2Opc_table[MAX_MOVE_TYPE][2] = | |
- { |
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/game/Unit.cpp b/src/game/Unit.cpp | |
index f097131..ad19f56 100644 | |
--- a/src/game/Unit.cpp | |
+++ b/src/game/Unit.cpp | |
@@ -8571,15 +8571,15 @@ void Unit::SetSpeedRate(UnitMoveType mtype, float rate, bool forced) | |
const uint16 SetSpeed2Opc_table[MAX_MOVE_TYPE][2] = | |
{ | |
- {MSG_MOVE_SET_WALK_SPEED, SMSG_FORCE_WALK_SPEED_CHANGE}, | |
- {MSG_MOVE_SET_RUN_SPEED, SMSG_FORCE_RUN_SPEED_CHANGE}, |
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/game/Unit.cpp b/src/game/Unit.cpp | |
index 38ad185..7b13b71 100644 | |
--- a/src/game/Unit.cpp | |
+++ b/src/game/Unit.cpp | |
@@ -894,11 +894,6 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa | |
pVictim->AttackedBy(this); | |
} | |
- if (damagetype == DIRECT_DAMAGE || damagetype == SPELL_DIRECT_DAMAGE) | |
- { |
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/game/Unit.cpp b/src/game/Unit.cpp | |
index 38ad185..8344526 100644 | |
--- a/src/game/Unit.cpp | |
+++ b/src/game/Unit.cpp | |
@@ -896,8 +896,7 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa | |
if (damagetype == DIRECT_DAMAGE || damagetype == SPELL_DIRECT_DAMAGE) | |
{ | |
- if (!spellProto || !(spellProto->AuraInterruptFlags & AURA_INTERRUPT_FLAG_DIRECT_DAMAGE)) | |
- pVictim->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_DIRECT_DAMAGE); |
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
commit b6bd5dd9ef35ec2158c27a92ff215028e1493911 | |
Author: Cyberium <[email protected]> | |
Date: Tue Dec 31 18:53:45 2013 +0100 | |
add possibility to extract only some tile | |
diff --git a/contrib/mesh_extractor/src/ContinentBuilder.cpp b/contrib/mesh_extractor/src/ContinentBuilder.cpp | |
index 8321a79..867c777 100644 | |
--- a/contrib/mesh_extractor/src/ContinentBuilder.cpp | |
+++ b/contrib/mesh_extractor/src/ContinentBuilder.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
commit d9b6fee959fb28301e8ac04ffad2cb867f73c062 | |
Author: Cyberium <[email protected]> | |
Date: Tue Dec 31 13:43:06 2013 +0100 | |
Correct a crash due to invalid pointer. | |
Add a possibility to abort program before start | |
diff --git a/contrib/mesh_extractor/src/LiquidHandler.cpp b/contrib/mesh_extractor/src/LiquidHandler.cpp | |
index fa59d1b..97a92a7 100644 | |
--- a/contrib/mesh_extractor/src/LiquidHandler.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
diff --git a/ScriptMgr.cpp b/ScriptMgr.cpp | |
index b496a47..46185aa 100644 | |
--- a/ScriptMgr.cpp | |
+++ b/ScriptMgr.cpp | |
@@ -202,7 +202,7 @@ void DoOrSimulateScriptTextForMap(int32 iTextEntry, uint32 uiCreatureEntry, Map* | |
} | |
debug_log("SD2: DoOrSimulateScriptTextForMap: text entry=%i, Sound=%u, Type=%u, Language=%u, Emote=%u", | |
- iTextEntry, pData->SoundId, pData->Type, pData->Language, pData->Emote); | |
+ iTextEntry, pData->SoundId, pData->Type, pData->LanguageId, pData->Emote); |
NewerOlder