Skip to content

remove useless ! #2054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erwan-joly merged 1 commit into from
Jan 18, 2026
Merged

remove useless ! #2054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/NosCore.Database/NosCoreContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)

modelBuilder.Entity<Character>()
.HasOne(e => e.Script)
.WithMany(e => e!.Characters)
.WithMany(e => e.Characters)
.HasForeignKey(e => e.CurrentScriptId)
.OnDelete(DeleteBehavior.Restrict);

Expand Down Expand Up @@ -421,13 +421,13 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)

modelBuilder.Entity<Mail>()
.HasOne(e => e.ItemInstance)
.WithMany(e => e!.Mail)
.WithMany(e => e.Mail)
.HasForeignKey(e => e.ItemInstanceId)
.OnDelete(DeleteBehavior.Restrict);

modelBuilder.Entity<MinilandObject>()
.HasOne(e => e.InventoryItemInstance)
.WithMany(e => e!.MinilandObject)
.WithMany(e => e.MinilandObject)
.HasForeignKey(e => e.InventoryItemInstanceId)
.OnDelete(DeleteBehavior.Restrict);

Expand Down Expand Up @@ -465,7 +465,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)

modelBuilder.Entity<Mail>()
.HasOne(e => e.ItemInstance)
.WithMany(e => e!.Mail)
.WithMany(e => e.Mail)
.HasForeignKey(e => e.ItemInstanceId)
.OnDelete(DeleteBehavior.Restrict);

Expand Down Expand Up @@ -511,13 +511,13 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)

modelBuilder.Entity<MapType>()
.HasOne(e => e.RespawnMapType)
.WithMany(e => e!.MapTypes)
.WithMany(e => e.MapTypes)
.HasForeignKey(e => e.RespawnMapTypeId)
.OnDelete(DeleteBehavior.Restrict);

modelBuilder.Entity<MapType>()
.HasOne(e => e.ReturnMapType)
.WithMany(e => e!.MapTypes1)
.WithMany(e => e.MapTypes1)
.HasForeignKey(e => e.ReturnMapTypeId)
.OnDelete(DeleteBehavior.Restrict);

Expand Down Expand Up @@ -551,19 +551,19 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)

modelBuilder.Entity<BCard>()
.HasOne(e => e.Skill)
.WithMany(e => e!.BCards)
.WithMany(e => e.BCards)
.HasForeignKey(e => e.SkillVNum)
.OnDelete(DeleteBehavior.Restrict);

modelBuilder.Entity<BCard>()
.HasOne(e => e.NpcMonster)
.WithMany(e => e!.BCards)
.WithMany(e => e.BCards)
.HasForeignKey(e => e.NpcMonsterVNum)
.OnDelete(DeleteBehavior.Restrict);

modelBuilder.Entity<BCard>()
.HasOne(e => e.Card)
.WithMany(e => e!.BCards)
.WithMany(e => e.BCards)
.HasForeignKey(e => e.CardId)
.OnDelete(DeleteBehavior.Restrict);

Expand All @@ -580,7 +580,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)

modelBuilder.Entity<BCard>()
.HasOne(e => e.Item)
.WithMany(e => e!.BCards)
.WithMany(e => e.BCards)
.HasForeignKey(e => e.ItemVNum)
.OnDelete(DeleteBehavior.Restrict);

Expand Down
6 changes: 3 additions & 3 deletions src/NosCore.GameObject/Character.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public class Character(IInventoryService inventory, IExchangeService exchangeSer

public bool InExchangeOrShop => InExchange || InShop;

public bool InExchange => ExchangeProvider!.CheckExchange(VisualId);
public bool InExchange => ExchangeProvider.CheckExchange(VisualId);

public bool InShop { get; set; }

Expand Down Expand Up @@ -497,8 +497,8 @@ public async Task BuyAsync(Shop shop, short slot, short amount)
return;
}

var price = item.Price ?? item.ItemInstance!.Item!.Price * amount;
var reputprice = item.Price == null ? item.ItemInstance!.Item!.ReputPrice * amount : 0;
var price = item.Price ?? item.ItemInstance!.Item.Price * amount;
var reputprice = item.Price == null ? item.ItemInstance!.Item.ReputPrice * amount : 0;
var percent = DignityIcon switch
{
DignityType.Dreadful => 1.1,
Expand Down
2 changes: 1 addition & 1 deletion src/NosCore.GameObject/ComponentEntities/Extensions/AliveEntityExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public static SayItemPacket GenerateSayItem(this IAliveEntity aliveEntity, strin
Message = message,
IconInfo = isNormalItem ? new IconInfoPacket
{
IconId = item.ItemInstance!.ItemVNum
IconId = item.ItemInstance.ItemVNum
} : null,
EquipmentInfo = isNormalItem ? null : new EInfoPacket(),
SlInfo = item.Type != NoscorePocketType.Specialist ? null : new SlInfoPacket()
Expand Down
14 changes: 7 additions & 7 deletions src/NosCore.GameObject/ComponentEntities/Extensions/CharacterEntityExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public static IEnumerable<IPacket> GenerateInv(this ICharacterEntity characterEn
switch (inv.Type)
{
case NoscorePocketType.Equipment:
if (inv.ItemInstance!.Item!.EquipmentSlot == EquipmentType.Sp)
if (inv.ItemInstance.Item.EquipmentSlot == EquipmentType.Sp)
{
if (inv.ItemInstance is SpecialistInstance specialistInstance)
{
Expand Down Expand Up @@ -117,21 +117,21 @@ public static IEnumerable<IPacket> GenerateInv(this ICharacterEntity characterEn
case NoscorePocketType.Main:
inv1.IvnSubPackets.Add(new IvnSubPacket
{
Slot = inv.Slot, VNum = inv.ItemInstance!.ItemVNum, RareAmount = inv.ItemInstance.Amount
Slot = inv.Slot, VNum = inv.ItemInstance.ItemVNum, RareAmount = inv.ItemInstance.Amount
});
break;

case NoscorePocketType.Etc:
inv2.IvnSubPackets.Add(new IvnSubPacket
{
Slot = inv.Slot, VNum = inv.ItemInstance!.ItemVNum, RareAmount = inv.ItemInstance.Amount
Slot = inv.Slot, VNum = inv.ItemInstance.ItemVNum, RareAmount = inv.ItemInstance.Amount
});
break;

case NoscorePocketType.Miniland:
inv3.IvnSubPackets.Add(new IvnSubPacket
{
Slot = inv.Slot, VNum = inv.ItemInstance!.ItemVNum, RareAmount = inv.ItemInstance.Amount
Slot = inv.Slot, VNum = inv.ItemInstance.ItemVNum, RareAmount = inv.ItemInstance.Amount
});
break;

Expand Down Expand Up @@ -284,7 +284,7 @@ public static MlobjlstPacket GenerateMlobjlst(this ICharacterEntity characterEnt
{
MapX = used ? mp!.MapX : (short)0,
MapY = used ? mp!.MapY : (short)0,
Width = item.ItemInstance!.Item!.Width != 0 ? item.ItemInstance.Item.Width : (byte)1,
Width = item.ItemInstance.Item.Width != 0 ? item.ItemInstance.Item.Width : (byte)1,
Height = item.ItemInstance.Item.Height != 0 ? item.ItemInstance.Item.Height : (byte)1,
DurabilityPoint = used ? item.ItemInstance.DurabilityPoint : 0,
Unknown = 100,
Expand Down Expand Up @@ -633,9 +633,9 @@ public static TalkPacket GenerateTalk(this ICharacterEntity visualEntity, string
return new EquipmentSubPacket
{
EquipmentType = eqType,
VNum = eq.ItemInstance!.ItemVNum,
VNum = eq.ItemInstance.ItemVNum,
Rare = eq.ItemInstance.Rare,
Upgrade = (eq.ItemInstance!.Item!.IsColored ? eq.ItemInstance?.Design
Upgrade = (eq.ItemInstance.Item.IsColored ? eq.ItemInstance?.Design
: eq.ItemInstance.Upgrade) ?? 0,
Unknown = 0
};
Expand Down
2 changes: 1 addition & 1 deletion src/NosCore.GameObject/ComponentEntities/Extensions/ItemInstanceExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public static IvnPacket GeneratePocketChange(this InventoryItemInstance? itemIns
new()
{
Slot = slot,
VNum = itemInstance.ItemInstance!.ItemVNum,
VNum = itemInstance.ItemInstance.ItemVNum,
RareAmount =
itemInstance.Type != NoscorePocketType.Equipment ? itemInstance.ItemInstance.Amount
: itemInstance.ItemInstance.Rare,
Expand Down
4 changes: 2 additions & 2 deletions src/NosCore.GameObject/Networking/Broadcaster.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ public IEnumerable<ICharacterEntity> GetCharacters()

public IEnumerable<ICharacterEntity> GetCharacters(Func<ICharacterEntity, bool>? func)
{
var selection = ClientSessions.Values.Where(s => s.Character != null!).Select(s => s.Character!);
var selection = ClientSessions.Values.Where(s => s.Character != null!).Select(s => s.Character);
return func == null ? selection : selection.Where(func);
}

public ICharacterEntity? GetCharacter(Func<ICharacterEntity, bool>? func)
{
var selection = ClientSessions.Values.Where(s => s.Character != null!).Select(c => c.Character!);
var selection = ClientSessions.Values.Where(s => s.Character != null!).Select(c => c.Character);
return func == null ? selection.FirstOrDefault() : selection.FirstOrDefault(func);
}

Expand Down
2 changes: 1 addition & 1 deletion src/NosCore.GameObject/Services/BazaarService/BazaarService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public async Task<LanguageKey> AddBazaarAsync(Guid itemInstanceId, long characte
}

var result = bzMod.Apply(JsonDocument.Parse(JsonSerializer.SerializeToUtf8Bytes(item, new JsonSerializerOptions().ConfigureForNodaTime(DateTimeZoneProviders.Tzdb))).RootElement.AsNode());
item = JsonSerializer.Deserialize<BazaarLink>(result!.Result, new JsonSerializerOptions().ConfigureForNodaTime(DateTimeZoneProviders.Tzdb));
item = JsonSerializer.Deserialize<BazaarLink>(result.Result, new JsonSerializerOptions().ConfigureForNodaTime(DateTimeZoneProviders.Tzdb));
var bz = item!.BazaarItem!;
await bazaarItemDao.TryInsertOrUpdateAsync(bz).ConfigureAwait(true);
holder.BazaarItems[item.BazaarItem!.BazaarItemId] = item;
Expand Down
2 changes: 1 addition & 1 deletion src/NosCore.GameObject/Services/BroadcastService/PacketBroadcaster.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public async Task SendToAsync(IPacketTarget target, IEnumerable<IPacket> packets
var packetList = packets.ToList();
var sessions = GetTargetSessions(target);

var tasks = sessions.Select(s => s.Sender.SendPacketsAsync(packetList!));
var tasks = sessions.Select(s => s.Sender.SendPacketsAsync(packetList));
await Task.WhenAll(tasks).ConfigureAwait(false);
}

Expand Down
2 changes: 1 addition & 1 deletion src/NosCore.GameObject/Services/EventLoaderService/Clock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public async Task Run(CancellationToken stoppingToken)
{
LastTick = clock.GetCurrentInstant();
_eventRunnerService.LoadHandlers(this);
Requests[typeof(ITimedEventHandler)]!.OnNext(new RequestData<Instant>(clock.GetCurrentInstant()));
Requests[typeof(ITimedEventHandler)].OnNext(new RequestData<Instant>(clock.GetCurrentInstant()));
await Task.Delay(100, stoppingToken);
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/NosCore.GameObject/Services/ExchangeService/ExchangeService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void SetGold(long visualId, long gold, long bankGold)
dictionary);
}

if (exchangeInfo.ExchangeItems.Keys.Any(s => !s.ItemInstance!.Item!.IsTradable))
if (exchangeInfo.ExchangeItems.Keys.Any(s => !s.ItemInstance.Item.IsTradable))
{
dictionary.Add(session.Character.CharacterId, new InfoiPacket
{
Expand All @@ -108,9 +108,9 @@ public void SetGold(long visualId, long gold, long bankGold)
}

if (session.Character.InventoryService.EnoughPlace(
targetInfo.ExchangeItems.Keys.Select(s => s.ItemInstance!).ToList(),
targetInfo.ExchangeItems.Keys.Select(s => s.ItemInstance).ToList(),
targetInfo.ExchangeItems.Keys.First().Type) && targetSession.InventoryService.EnoughPlace(
exchangeInfo.ExchangeItems.Keys.Select(s => s.ItemInstance!).ToList(),
exchangeInfo.ExchangeItems.Keys.Select(s => s.ItemInstance).ToList(),
targetInfo.ExchangeItems.Keys.First().Type))
{
return new Tuple<ExchangeResultType, Dictionary<long, IPacket>?>(ExchangeResultType.Success, null);
Expand Down Expand Up @@ -234,7 +234,7 @@ public List<KeyValuePair<long, IvnPacket>> ProcessExchange(long firstUser, long
var sessionId = user == firstUser ? firstUser : secondUser;
InventoryItemInstance? newItem = null;

if (item.Value == item.Key.ItemInstance!.Amount)
if (item.Value == item.Key.ItemInstance.Amount)
{
originInventory.Remove(item.Key.ItemInstanceId);
}
Expand Down
2 changes: 1 addition & 1 deletion src/NosCore.GameObject/Services/GuriRunnerService/Handlers/TitleGuriHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public async Task ExecuteAsync(RequestData<GuriPacket> requestData)
requestData.ClientSession.Character.Titles.Add(new TitleDto
{
Id = Guid.NewGuid(),
TitleType = inv.ItemInstance!.ItemVNum,
TitleType = inv.ItemInstance.ItemVNum,
Visible = false,
Active = false,
CharacterId = requestData.ClientSession.Character.VisualId
Expand Down
2 changes: 1 addition & 1 deletion src/NosCore.GameObject/Services/InventoryService/InventoryItemInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static InventoryItemInstance Create(IItemInstance it, long characterId,
Id = inventoryItemInstance?.Id ?? Guid.NewGuid(),
CharacterId = characterId,
Slot = inventoryItemInstance?.Slot ?? 0,
Type = inventoryItemInstance?.Type ?? it.Item!.Type
Type = inventoryItemInstance?.Type ?? it.Item.Type
};
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/NosCore.GameObject/Services/InventoryService/InventoryService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,13 @@ public int CountItemInAnPocket(NoscorePocketType inv)
&& ((newItem.Type == NoscorePocketType.Etc) || (newItem.Type == NoscorePocketType.Main)))
{
var slotNotFull = this.ToList().Select(s => s.Value).Where(i =>
i.ItemInstance!.ItemVNum.Equals(newItem.ItemInstance!.ItemVNum) &&
i.ItemInstance.ItemVNum.Equals(newItem.ItemInstance.ItemVNum) &&
(i.ItemInstance.Amount < configuration.Value.MaxItemAmount));
var freeslot = GetMaxSlot(newItem.Type) - this.Count(s => s.Value.Type == newItem.Type);
IEnumerable<InventoryItemInstance> itemInstances =
slotNotFull as IList<InventoryItemInstance> ?? slotNotFull.ToList();
if (newItem.ItemInstance!.Amount <= freeslot * configuration.Value.MaxItemAmount
+ itemInstances.Sum(s => configuration.Value.MaxItemAmount - s.ItemInstance!.Amount))
if (newItem.ItemInstance.Amount <= freeslot * configuration.Value.MaxItemAmount
+ itemInstances.Sum(s => configuration.Value.MaxItemAmount - s.ItemInstance.Amount))
{
foreach (var slotToAdd in itemInstances)
{
Expand All @@ -143,7 +143,7 @@ public int CountItemInAnPocket(NoscorePocketType inv)

// Create new item
var freeSlot = newItem.Type == NoscorePocketType.Wear
? LoadBySlotAndType((short)newItem.ItemInstance!.Item!.EquipmentSlot, NoscorePocketType.Wear) == null
? LoadBySlotAndType((short)newItem.ItemInstance!.Item.EquipmentSlot, NoscorePocketType.Wear) == null
? (short?)newItem.ItemInstance.Item.EquipmentSlot
: null
: GetFreeSlot(newItem.Type);
Expand Down Expand Up @@ -307,7 +307,7 @@ public InventoryItemInstance LoadByItemInstanceId(Guid id)
if (targetType == NoscorePocketType.Wear)
{
nextFreeSlot =
LoadBySlotAndType((short)sourceInstance.ItemInstance.Item!.EquipmentSlot, targetType) == null
LoadBySlotAndType((short)sourceInstance.ItemInstance.Item.EquipmentSlot, targetType) == null
? (short)sourceInstance.ItemInstance.Item.EquipmentSlot
: (short)-1;
}
Expand Down Expand Up @@ -374,7 +374,7 @@ public bool TryMoveItem(NoscorePocketType sourcetype, short sourceSlot, short am
break;
default:
if ((destinationPocket.ItemInstance?.ItemVNum == sourcePocket.ItemInstance.ItemVNum)
&& ((sourcePocket.ItemInstance.Item!.Type == NoscorePocketType.Main) ||
&& ((sourcePocket.ItemInstance.Item.Type == NoscorePocketType.Main) ||
(sourcePocket.ItemInstance.Item.Type == NoscorePocketType.Etc)))
{
if (destinationPocket.ItemInstance.Amount + amount > configuration.Value.MaxItemAmount)
Expand Down
2 changes: 1 addition & 1 deletion src/NosCore.GameObject/Services/ItemGenerationService/Handlers/BackPackHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public async Task ExecuteAsync(RequestData<Tuple<InventoryItemInstance, UseItemP
{
var itemInstance = requestData.Data.Item1;

if (itemInstance.ItemInstance!.Item!.Effect == ItemEffectType.InventoryUpgrade
if (itemInstance.ItemInstance.Item.Effect == ItemEffectType.InventoryUpgrade
&& requestData.ClientSession.Character.StaticBonusList.Any(s => s.StaticBonusType == StaticBonusType.BackPack))
{
await requestData.ClientSession.SendPacketAsync(new SayiPacket
Expand Down
2 changes: 1 addition & 1 deletion src/NosCore.GameObject/Services/ItemGenerationService/Handlers/BazaarMedalsHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public async Task ExecuteAsync(RequestData<Tuple<InventoryItemInstance, UseItemP
requestData.ClientSession.Character.StaticBonusList.Add(new StaticBonusDto
{
CharacterId = requestData.ClientSession.Character.CharacterId,
DateEnd = clock.GetCurrentInstant().Plus(Duration.FromDays(itemInstance.ItemInstance!.Item!.EffectValue)),
DateEnd = clock.GetCurrentInstant().Plus(Duration.FromDays(itemInstance.ItemInstance.Item.EffectValue)),
StaticBonusType = itemInstance.ItemInstance.Item.Effect == ItemEffectType.SilverNosMerchantUpgrade
? StaticBonusType.BazaarMedalSilver : StaticBonusType.BazaarMedalGold
});
Expand Down
2 changes: 1 addition & 1 deletion src/NosCore.GameObject/Services/ItemGenerationService/Handlers/SpRechargerHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public async Task ExecuteAsync(RequestData<Tuple<InventoryItemInstance, UseItemP
itemInstance.ItemInstanceId);
await requestData.ClientSession.SendPacketAsync(
itemInstance.GeneratePocketChange((PocketType)itemInstance.Type, itemInstance.Slot)).ConfigureAwait(false);
await requestData.ClientSession.Character.AddAdditionalSpPointsAsync(itemInstance.ItemInstance!.Item!.EffectValue).ConfigureAwait(false);
await requestData.ClientSession.Character.AddAdditionalSpPointsAsync(itemInstance.ItemInstance.Item.EffectValue).ConfigureAwait(false);
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/NosCore.GameObject/Services/ItemGenerationService/Handlers/TitleHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public Task ExecuteAsync(RequestData<Tuple<InventoryItemInstance, UseItemPacket>
YesPacket = new GuriPacket
{
Type = GuriPacketType.Title,
Argument = (uint)requestData.Data.Item1.ItemInstance!.ItemVNum,
Argument = (uint)requestData.Data.Item1.ItemInstance.ItemVNum,
EntityId = requestData.Data.Item1.Slot
},
Question = Game18NConstString.AskAddTitle
Expand Down
Loading
Loading