Merge branch 'master' of https://github.com/celguar/mangosbot-bots

celguar · Nov 28, 2022 · 8f4570a · 8f4570a
2 parents 7d43ae7 + 7a20c77
commit 8f4570a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/playerbot/RandomPlayerbotMgr.cpp b/playerbot/RandomPlayerbotMgr.cpp
@@ -2209,7 +2209,7 @@ uint32 RandomPlayerbotMgr::GetZoneLevel(uint16 mapId, float teleX, float teleY,
 
 void RandomPlayerbotMgr::Refresh(Player* bot)
 {
-    if (!bot->GetMap())
+    if (bot->IsBeingTeleported() || !bot->GetMap())
         return;
 
     if (sServerFacade.UnitIsDead(bot))
@@ -2597,6 +2597,9 @@ void RandomPlayerbotMgr::HandleCommand(uint32 type, const string& text, Player&
         if (team != TEAM_BOTH_ALLOWED && bot->GetTeam() != team)
             continue;
 
+        if (type == CHAT_MSG_GUILD && bot->GetGuildId() != fromPlayer.GetGuildId())
+            continue;
+
         if (!channelName.empty())
         {
             if (ChannelMgr* cMgr = channelMgr(bot->GetTeam()))