diff options
| author | Kudlaty <none@none> | 2009-08-14 00:07:14 +0200 |
|---|---|---|
| committer | Kudlaty <none@none> | 2009-08-14 00:07:14 +0200 |
| commit | ad4397b40d820cc30fe83acf982aa30d7278813e (patch) | |
| tree | f45d9f80fcc71469cadb707b4761235d71e29196 /src/bindings/scripts | |
| parent | f58781dbad7ea0fdad91ebcedf6be92645189289 (diff) | |
| parent | c9ddf9258d159dc8aa5a4e29cd83c158c8479d24 (diff) | |
merge
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/scripts')
| -rw-r--r-- | src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp index b820b947e9e..3fca340a7b3 100644 --- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp +++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp @@ -1012,7 +1012,7 @@ struct TRINITY_DLL_DECL npc_death_knight_initiateAI : public SpellAI { if (m_bIsDuelInProgress && pDoneBy->IsControlledByPlayer()) { - if (pDoneBy->GetGUID() != m_uiDuelerGUID || pDoneBy->GetOwnerGUID() != m_uiDuelerGUID) // other players cannot help + if (pDoneBy->GetGUID() != m_uiDuelerGUID && pDoneBy->GetOwnerGUID() != m_uiDuelerGUID) // other players cannot help uiDamage = 0; else if (uiDamage >= m_creature->GetHealth()) { |