[TC] Supportet / not double issue

[Krutok]

DO NOT REMOVE OR SKIP THE ISSUE TEMPLATE

• [X] I understand that my issue may get closed without notice if I intentionally remove or skip any mandatory* field

Current behaviour

Sorry but the patch you released is still not compatible with the current TC Core. Some files are not patched. I uninstalled the old patch then updated TC and tried to install the new patch.

Here are some screenshots.

rejected files

--- src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -5644,50 +5593,6 @@ void AuraEffect::HandleProcTriggerSpellAuraProc(AuraApplication* aurApp, ProcEve
     if (SpellInfo const* triggeredSpellInfo = sSpellMgr->GetSpellInfo(triggerSpellId))
     {
         TC_LOG_DEBUG("spells.aura.effect", "AuraEffect::HandleProcTriggerSpellAuraProc: Triggering spell %u from aura %u proc", triggeredSpellInfo->Id, GetId());
-
-        //npcbot: override spellInfo
-        triggeredSpellInfo = triggeredSpellInfo->TryGetSpellInfoOverride(aurApp->GetBase()->GetCaster());
-        //end npcbot
-
-        //npcbot
-        Aura const* triggeredByAura = aurApp->GetBase();
-        int32 basepoints0 = 0;
-        switch (triggerSpellId)
-        {
-            // Quest - Self Healing from resurrect (invisible in log)
-            case 25155:
-            {
-                switch (GetId())
-                {
-                    //Vampiric Aura
-                    case 20810:
-                    {
-                        DamageInfo const* dinfo = eventInfo.GetDamageInfo();
-                        uint32 damage = dinfo->GetDamage();
-                        if (!damage)
-                            return;
-
-                        // 100% / 25%
-                        if (triggerTarget->GetGUID() == triggeredByAura->GetCasterGUID())
-                            basepoints0 = int32(damage);
-                        else
-                            basepoints0 = int32(damage / 4);
-
-                        CastSpellExtraArgs args(true);
-                        args.AddSpellBP0(basepoints0);
-                        triggerCaster->CastSpell(triggerTarget, triggerSpellId, args);
-                        return;
-                    }
-                    default:
-                        break;
-                }
-                break;
-            }
-            default:
-                break;
-        }
-        //end npcbot
-
         triggerCaster->CastSpell(triggerTarget, triggeredSpellInfo->Id, this);
     }
     else

--- src/server/game/Handlers/BattleGroundHandler.cpp
+++ src/server/game/Handlers/BattleGroundHandler.cpp
@@ -254,22 +249,6 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recvData)
             member->SendDirectMessage(&data);
             TC_LOG_DEBUG("bg.battleground", "Battleground: player joined queue for bg queue type %u bg type %u: GUID %s, NAME %s",
                 bgQueueTypeId, bgTypeId, member->GetGUID().ToString().c_str(), member->GetName().c_str());
-
-            //npcbot: list bots
-            if (!member->HaveBot())
-                continue;
-
-            BotMap const* map = member->GetBotMgr()->GetBotMap();
-            for (BotMap::const_iterator itr = map->begin(); itr != map->end(); ++itr)
-            {
-                Creature const* bot = itr->second;
-                if (!bot || !grp->IsMember(bot->GetGUID()))
-                    continue;
-
-                TC_LOG_DEBUG("bg.battleground", "Battleground: NPCBot joined queue for bg queue type %u bg type %u: GUID %s, NAME %s (owner: %s)",
-                    bgQueueTypeId, bgTypeId, bot->GetGUID().ToString().c_str(), bot->GetName().c_str(), member->GetName().c_str());
-            }
-            //end npcbot
         }
         TC_LOG_DEBUG("bg.battleground", "Battleground: group end");
     }

--- src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
+++ src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
@@ -807,18 +684,8 @@ BG_AV_Nodes BattlegroundAV::GetNodeThroughObject(uint32 object)
     return BG_AV_Nodes(0);
 }

-//npcbot
-/*
-//end npcbot
 uint32 BattlegroundAV::GetObjectThroughNode(BG_AV_Nodes node)
-//npcbot
-*/
-uint32 BattlegroundAV::GetObjectThroughNode(BG_AV_Nodes node, bool log) const
-//end npcbot
 { //this function is the counterpart to GetNodeThroughObject()
-    //npcbot
-    if (log)
-    //end npcbot
     TC_LOG_DEBUG("bg.battleground", "bg_AV GetObjectThroughNode %i", node);
     if (m_Nodes[node].Owner == ALLIANCE)
     {

--- src/server/game/Handlers/BattleGroundHandler.cpp
+++ src/server/game/Handlers/BattleGroundHandler.cpp
@@ -254,22 +249,6 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recvData)
             member->SendDirectMessage(&data);
             TC_LOG_DEBUG("bg.battleground", "Battleground: player joined queue for bg queue type %u bg type %u: GUID %s, NAME %s",
                 bgQueueTypeId, bgTypeId, member->GetGUID().ToString().c_str(), member->GetName().c_str());
-
-            //npcbot: list bots
-            if (!member->HaveBot())
-                continue;
-
-            BotMap const* map = member->GetBotMgr()->GetBotMap();
-            for (BotMap::const_iterator itr = map->begin(); itr != map->end(); ++itr)
-            {
-                Creature const* bot = itr->second;
-                if (!bot || !grp->IsMember(bot->GetGUID()))
-                    continue;
-
-                TC_LOG_DEBUG("bg.battleground", "Battleground: NPCBot joined queue for bg queue type %u bg type %u: GUID %s, NAME %s (owner: %s)",
-                    bgQueueTypeId, bgTypeId, bot->GetGUID().ToString().c_str(), bot->GetName().c_str(), member->GetName().c_str());
-            }
-            //end npcbot
         }
         TC_LOG_DEBUG("bg.battleground", "Battleground: group end");
     }

Crashlog

No response

Steps to reproduce the problem

No response

TrinityCore or AzerothCore

TrinityCore

Core rev. hash/commit

Patch Works with: TrinityCore rev. 2eb778ae635f+ 2023-06-21 12:16:01 +0200 (3.3.5 branch) (Unix, RelWithDebInfo, Static) but with warnings:

Setting up wander map...
No valid Neutral spawn node for at least level 60 on non-continent map 30.
No valid Neutral spawn node for at least level 60 on non-continent map 489.
No valid Neutral spawn node for at least level 60 on non-continent map 529.

but not with

https://github.com/TrinityCore/TrinityCore/commit/deec17d8ec82d436efc69680ae781e0de58b605c

Operating system

Debian 11

[trickerer]

You mean 5.4.117. Did you even check it? Was it a merge? Was https://github.com/trickerer/Trinity-Bots/issues/603 closed?

I appreciate the details but stop doing this please.

[Krutok]

You mean 5.4.117. Did you even check it? Was it a merge? Was #603 closed?

I appreciate the details but stop doing this please.

@trickerer

I'm just posting an error from patching I post errors and have tested it with both a fresh install and my existing install. Both versions get the error and yes I mean version v5.4.117a

and my error has nothing to do with the other error, so I opened an extra thread.