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

#W# Merge: Fixed Merge Conflicts.

Browse source
This commit is contained in:
WarrentyExpired 2026-09-12 16:47:55 -04:00
parent 275519b1ff
commit 5bbdd7f8d9
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs
View file

@ -195,10 +195,10 @@ public class AdvancedSearchGump : Gump
AddLabel(98, y, 0x384, "Null");
y += 20;
AddCheck(5, y, 0xD2, 0xD3, Filter.FilterVeridia, 308);
AddLabel(28, y, 0x384, "Fel");
AddCheck(75, y, 0xD2, 0xD3, Filter.FilterUnderworld, 309);
AddLabel(98, y, 0x384, "Tram");
AddCheck(5, y, 0xD2, 0xD3, Filter.FilterUnderworld, 308);
AddLabel(28, y, 0x384, "Und");
AddCheck(75, y, 0xD2, 0xD3, Filter.FilterVeridia, 309);
AddLabel(98, y, 0x384, "Ver");
y += 20;
AddCheck(5, y, 0xD2, 0xD3, Filter.FilterMalas, 310);

6
Projects/UOContent/Engines/Advanced Search/AdvancedSearchThreadWorker.cs
View file

@ -220,7 +220,7 @@ public class AdvancedSearchThreadWorker
{
var f = _filter;
var anySelected = f.FilterFelucca || f.FilterTrammel || f.FilterIlshenar || f.FilterMalas ||
var anySelected = f.FilterUnderworld || f.FilterVeridia || f.FilterIlshenar || f.FilterMalas ||
f.FilterTokuno || f.FilterTerMur || f.FilterInternalMap || f.FilterNullMap;
if (!anySelected)
@ -238,8 +238,8 @@ public class AdvancedSearchThreadWorker
return f.FilterInternalMap;
}
return map == Map.Felucca && f.FilterFelucca ||
map == Map.Trammel && f.FilterTrammel ||
return map == Map.Underworld && f.FilterUnderworld ||
map == Map.Veridia && f.FilterVeridia ||
map == Map.Ilshenar && f.FilterIlshenar ||
map == Map.Malas && f.FilterMalas ||
map == Map.Tokuno && f.FilterTokuno ||

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

@ -5,7 +5,6 @@ using Server.Misc;
using Server.Multis;
using Server.Regions;
using Server.Targeting;
using Server.Regions;
namespace Server.Mobiles;

2
Projects/UOContent/Systems/JailSystem/JailSystem.cs
View file

@ -42,7 +42,7 @@ public class JailSystem : GenericPersistence
// Jail map, change this for custom maps
public static readonly Map JailMap = Map.Veridia;
private static readonly JailRecord EmptyRecord = new();
private static readonly JailRecord EmptyRecord = new(null);
private static readonly HashSet<PlayerMobile> CurrentlyBeingJailed = [];
private static readonly Dictionary<PlayerMobile, JailRecord> PlayerJailRecords = [];