#W# Confict: Fixed BaseCreature git merge conflict.

This commit is contained in:
WarrentyExpired 2026-10-10 23:17:41 -04:00
commit ad38314ca7
112 changed files with 5397 additions and 616 deletions

View file

@ -213,7 +213,7 @@ namespace Server.Commands
{
if (m is BaseCreature bc)
{
if (bc.Controlled && bc.ControlMaster == master || bc.Summoned && bc.SummonMaster == master)
if (bc.GetMaster() == master)
{
pets.Add(bc);
}