diff --git a/zone/merc.cpp b/zone/merc.cpp index 3dd9f8e3e..01a4ff1b4 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -5165,12 +5165,9 @@ bool Merc::Unsuspend(bool setMaxStats) { return true; } -bool Merc::Dismiss() { - Client* mercOwner; +bool Merc::Dismiss(){ - if(GetMercOwner()) { - mercOwner = GetMercOwner(); - } + Client* mercOwner = GetMercOwner(); if(!mercOwner) return false;