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

fix: Fixes various issues (#748)

Browse source 
https://github.com/modernuo/ModernUO/pull/741/files
This commit is contained in:
Kamron Batman 2021-08-30 07:54:52 -07:00 • committed by GitHub
parent 28faf4346f
commit c789a7f78a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Projects/Server/Items/Item.cs
View file

@ -2110,7 +2110,7 @@ namespace Server
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool CheckRace(Race race) => Race.IsAllowedRace(race, RequiredRaces);
public bool CheckRace(Mobile from, bool message = true)
public virtual bool CheckRace(Mobile from, bool message = true)
{
var race = from.Race;
var requiredRaces = RequiredRaces;
@ -2125,21 +2125,21 @@ namespace Server
return false;
}
if (race == Race.Gargoyle)
if (requiredRaces == Race.AllowGargoylesOnly)
{
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1111707); // Only gargoyles can wear this.
}
else if (race == Race.Gargoyle)
{
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1111708); // Gargoyles can't wear this.
}
else if (requiredRaces == Race.AllowGargoylesOnly)
{
from.LocalOverheadMessage(Network.MessageType.Regular, 0x3B2, 1111707); // Only gargoyles can wear this.
}
else if (race != Race.Elf)
else if (requiredRaces == Race.AllowElvesOnly)
{
from.SendLocalizedMessage(1072203); // Only Elves may use this.
}
else if (race != Race.Human)
else
{
from.SendMessage($"Only {race.PluralName} may use this.");
from.SendMessage($"{race.PluralName} may not use this.");
}
return false;

4
Projects/Server/Network/Packets/OutgoingMapPackets.cs
View file

@ -41,8 +41,8 @@ namespace Server.Network
{
var map = Map.Maps[i];
writer.Write(map.Tiles.Patch.StaticBlocks);
writer.Write(map.Tiles.Patch.LandBlocks);
writer.Write(map?.Tiles.Patch.StaticBlocks ?? 0);
writer.Write(map?.Tiles.Patch.LandBlocks ?? 0);
}
}