diff --git a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs index 95b1a1040..1664a7e81 100644 --- a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs +++ b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs @@ -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); diff --git a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchThreadWorker.cs b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchThreadWorker.cs index 1b44c789a..0820344d4 100644 --- a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchThreadWorker.cs +++ b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchThreadWorker.cs @@ -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 || diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs b/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs index 17d1ba616..654aea7fc 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/BaseMount.cs @@ -5,7 +5,6 @@ using Server.Misc; using Server.Multis; using Server.Regions; using Server.Targeting; -using Server.Regions; namespace Server.Mobiles; diff --git a/Projects/UOContent/Systems/JailSystem/JailSystem.cs b/Projects/UOContent/Systems/JailSystem/JailSystem.cs index 35a5322f2..c726290c2 100644 --- a/Projects/UOContent/Systems/JailSystem/JailSystem.cs +++ b/Projects/UOContent/Systems/JailSystem/JailSystem.cs @@ -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 CurrentlyBeingJailed = []; private static readonly Dictionary PlayerJailRecords = [];