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

14
Projects/UOContent/Multis/Boats/BaseBoat.cs
View file

@ -1924,8 +1924,18 @@ namespace Server.Multis
_includeBoat = includeBoat;
_boat = boat;
_mobiles = boat.Map.GetMobilesInBounds(bounds).GetEnumerator();
_items = boat.Map.GetItemsInBounds(bounds).GetEnumerator();
var map = boat.Map;
if (map == null)
{
_mobiles = Map.MobileBoundsEnumerable<Mobile>.Empty.GetEnumerator();
_items = Map.ItemBoundsEnumerable<Item>.Empty.GetEnumerator();
}
else
{
_mobiles = map.GetMobilesInBounds(bounds).GetEnumerator();
_items = map.GetItemsInBounds(bounds).GetEnumerator();
}
_iterateMobiles = true;
_iterateItems = true;
}

7
Projects/UOContent/Multis/Houses/BaseHouse.cs
View file

@ -3660,12 +3660,7 @@ namespace Server.Multis
return true;
}
if (!(bc.Controlled || bc.Summoned))
{
return false;
}
m = bc.ControlMaster ?? bc.SummonMaster;
m = bc.GetMaster();
return m != null && (m.AccessLevel > AccessLevel.Player || IsFriend(m) || Access?.Contains(m) == true);
}