diff options
| -rw-r--r-- | src/game/Player.cpp | 8 | ||||
| -rw-r--r-- | src/game/QuestDef.h | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 5957ba101c1..bea6ab66805 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -1737,6 +1737,10 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati } else { + if(getClass() == CLASS_DEATH_KNIGHT && GetMapId() == 609 && !isGameMaster() + && !IsActiveQuest(13188) && !IsActiveQuest(13189)) + return false; + // far teleport to another map Map* oldmap = IsInWorld() ? GetMap() : NULL; // check if we can enter before stopping combat / removing pet / totems / interrupting spells @@ -12468,8 +12472,8 @@ void Player::PrepareQuestMenu( uint64 guid ) qm.AddMenuItem(quest_id, DIALOG_STATUS_UNK2); else if ( status == QUEST_STATUS_INCOMPLETE ) qm.AddMenuItem(quest_id, DIALOG_STATUS_UNK2); - else if (status == QUEST_STATUS_AVAILABLE ) - qm.AddMenuItem(quest_id, DIALOG_STATUS_CHAT); + //else if (status == QUEST_STATUS_AVAILABLE ) + // qm.AddMenuItem(quest_id, DIALOG_STATUS_CHAT); } for(QuestRelations::const_iterator i = pObjectQR->lower_bound(pObject->GetEntry()); i != pObjectQR->upper_bound(pObject->GetEntry()); ++i) diff --git a/src/game/QuestDef.h b/src/game/QuestDef.h index c3285ec816c..412c66cf9fd 100644 --- a/src/game/QuestDef.h +++ b/src/game/QuestDef.h @@ -96,9 +96,9 @@ enum QuestStatus { QUEST_STATUS_NONE = 0, QUEST_STATUS_COMPLETE = 1, - QUEST_STATUS_UNAVAILABLE = 2, + //QUEST_STATUS_UNAVAILABLE = 2, QUEST_STATUS_INCOMPLETE = 3, - QUEST_STATUS_AVAILABLE = 4, + //QUEST_STATUS_AVAILABLE = 4, MAX_QUEST_STATUS }; |