#W# Confict: Fixed BaseCreature git merge conflict.
This commit is contained in:
commit
ad38314ca7
112 changed files with 5397 additions and 616 deletions
|
|
@ -256,7 +256,6 @@ namespace Server.Mobiles
|
|||
pet.Internalize();
|
||||
|
||||
pet.SetControlMaster(null);
|
||||
pet.SummonMaster = null;
|
||||
|
||||
pet.IsStabled = true;
|
||||
pet.StabledBy = from;
|
||||
|
|
@ -358,11 +357,6 @@ namespace Server.Mobiles
|
|||
{
|
||||
pet.SetControlMaster(from);
|
||||
|
||||
if (pet.SummonMaster != null)
|
||||
{
|
||||
pet.SummonMaster = from;
|
||||
}
|
||||
|
||||
pet.ControlTarget = from;
|
||||
pet.ControlOrder = OrderType.Follow;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue