diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-09 18:26:31 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-09 18:26:31 +0200 |
| commit | ce742dc7a07505e5e5fb015b601343b32855e325 (patch) | |
| tree | 748714fab1f817102dfebfafaa8b082e611f8cca /src/server/scripts/Commands | |
| parent | be75ddc2bd99045e53523a06707526b233fd0c32 (diff) | |
| parent | be5cf42ec392e8526d3180e51ffaacb84e883fae (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/Battleground.h
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Guilds/Guild.cpp
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_guild.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp index 390594ac57b..04276016fff 100644 --- a/src/server/scripts/Commands/cs_guild.cpp +++ b/src/server/scripts/Commands/cs_guild.cpp @@ -119,6 +119,7 @@ public: return false; targetGuild->Disband(); + delete targetGuild; return true; } @@ -165,7 +166,7 @@ public: if (!targetGuild) return false; - targetGuild->DeleteMember(targetGuid, false, true); + targetGuild->DeleteMember(targetGuid, false, true, true); return true; } |