warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#W# Confict: Fixed BaseCreature git merge conflict.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Mobiles/Animals/Misc/PackHorse.cs
View file

@ -137,7 +137,7 @@ namespace Server.Mobiles
public static bool CheckAccess(BaseCreature animal, Mobile from) =>
from == animal || from.AccessLevel >= AccessLevel.GameMaster || from.Alive && animal.Controlled &&
!animal.IsDeadPet &&
(from == animal.ControlMaster || from == animal.SummonMaster || animal.IsPetFriend(from));
(from == animal.GetMaster() || animal.IsPetFriend(from));
public static void CombineBackpacks(BaseCreature animal)
{

3
Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs
View file

@ -239,8 +239,7 @@ public abstract partial class BaseMount : BaseCreature, IMount
if (from.InRange(this, 1))
{
var canAccess = from.AccessLevel >= AccessLevel.GameMaster
|| Controlled && ControlMaster == from
|| Summoned && SummonMaster == from;
|| GetMaster() == from;
if (canAccess)
{

4
Projects/UOContent/Mobiles/Animals/Mounts/Beetle.cs
View file

@ -71,7 +71,7 @@ namespace Server.Mobiles
public override void OnHarmfulSpell(Mobile from)
{
if (!Controlled && ControlMaster == null)
if (!Controlled)
{
CurrentSpeed = BoostedSpeed;
}
@ -79,7 +79,7 @@ namespace Server.Mobiles
public override void OnCombatantChange()
{
if (Combatant == null && !Controlled && ControlMaster == null)
if (Combatant == null && !Controlled)
{
CurrentSpeed = PassiveSpeed;
}