Skip to content

Fix various issues with updating guild items #81

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
Blackburn29 merged 1 commit into from
May 20, 2026
Merged

Fix various issues with updating guild items #81

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
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);CS1591,MA0048,MA0011,MA0015,MA0051,MA0002,MA0005,MA0004,MA0016,MA0069,MA0006,MA0076,MA0003,MA0004,MA0064</NoWarn>
<NoWarn>$(NoWarn),CS1591,MA0048,MA0011,MA0015,MA0051,MA0002,MA0005,MA0004,MA0016,MA0069,MA0006,MA0076,MA0003,MA0004,MA0064</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="3.0.27">
<PackageReference Include="Meziantou.Analyzer" Version="3.0.88">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions src/Fragment.NetSlum.Console/Fragment.NetSlum.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
<PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
<PackageReference Include="Spectre.Console.Cli" Version="0.53.1" />
<PackageReference Include="Spectre.Console.Cli" Version="0.55.0" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/Fragment.NetSlum.Core/Fragment.NetSlum.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@

<ItemGroup>
<PackageReference Include="EFCore.NamingConventions" Version="9.0.0" />
<PackageReference Include="IPNetwork2" Version="4.0.2">
<PackageReference Include="IPNetwork2" Version="4.3.0">
<Aliases>IPNetwork2</Aliases>
</PackageReference>
<PackageReference Include="Mediator.Abstractions" Version="3.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.14" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.16" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.8" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
<PackageReference Include="Serilog" Version="4.3.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.5" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.8" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions src/Fragment.NetSlum.Networking/Packets/Request/BaseRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ public abstract class BaseRequest
protected static ValueTask<ICollection<FragmentMessage>> SingleMessage(FragmentMessage response) =>
ValueTask.FromResult(SingleMessageAsync(response));

protected static ICollection<FragmentMessage> SingleMessageAsync(FragmentMessage response) =>
new[] { response };
protected static ICollection<FragmentMessage> SingleMessageAsync(FragmentMessage response) => [response];

protected static ValueTask<ICollection<FragmentMessage>> NoResponse() =>
ValueTask.FromResult<ICollection<FragmentMessage>>(Array.Empty<FragmentMessage>());
Expand Down
2 changes: 1 addition & 1 deletion src/Fragment.NetSlum.Networking/Packets/Request/Guilds/GetGuildDonationSettingsRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public override async ValueTask<ICollection<FragmentMessage>> GetResponse(Fragme
.AsNoTracking()
.FirstOrDefaultAsync(g => g.Id == session.GuildId);

var isGuildMaster = guild != null && guild.LeaderId == session.GuildId;
var isGuildMaster = guild != null && guild.LeaderId == session.CharacterId;

_logger.LogInformation("Guild donation settings requested for guild ID {GuildId} by player {PlayerId}({PlayerName}). Is Guild Master? {IsGuildMaster}", session.GuildId, session.CharacterId, session.CharacterInfo!.CharacterName, isGuildMaster);

Expand Down
47 changes: 30 additions & 17 deletions src/Fragment.NetSlum.Networking/Packets/Request/Guilds/UpdateGuildShopItemRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,53 @@
using Fragment.NetSlum.Networking.Sessions;
using Fragment.NetSlum.Persistence;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;

namespace Fragment.NetSlum.Networking.Packets.Request.Guilds;

[FragmentPacket(MessageType.Data, OpCodes.DataUpdateGuildShopItem)]
public class UpdateGuildShopItemRequest : BaseRequest
{
private readonly FragmentContext _database;
private readonly ILogger<UpdateGuildShopItemRequest> _logger;

public UpdateGuildShopItemRequest(FragmentContext database)
public UpdateGuildShopItemRequest(FragmentContext database, ILogger<UpdateGuildShopItemRequest> logger)
{
_database = database;
_logger = logger;
}

public override ValueTask<ICollection<FragmentMessage>> GetResponse(FragmentTcpSession session, FragmentMessage request)
public override async ValueTask<ICollection<FragmentMessage>> GetResponse(FragmentTcpSession session, FragmentMessage request)
{
var reader = new SpanReader(request.Data.Span);
var guildId = reader.ReadUInt16();
var itemId = reader.ReadInt32();
var generalPrice = reader.ReadUInt32();
var memberPrice = reader.ReadUInt32();
var allowGeneral = reader.ReadBool();
var allowMember = reader.ReadBool();

_database.GuildShopItems
.Where(gsi => gsi.Id == itemId && gsi.GuildId == guildId)
.ExecuteUpdate(e =>
e
.SetProperty(p => p.Price, v => generalPrice)
.SetProperty(p => p.MemberPrice, v => memberPrice)
.SetProperty(p => p.AvailableForGeneral, v => allowGeneral)
.SetProperty(p => p.AvailableForMember, v => allowMember)
.SetProperty(p => p.UpdatedAt, v => DateTime.UtcNow)
);

return SingleMessage(new UpdateGuildShopItemResponse().Build());
var allowGeneral = reader.ReadByte() == 0x01;
var allowMember = reader.ReadByte() == 0x01;


var gsi = _database.GuildShopItems.FirstOrDefault(gsi => gsi.ItemId == itemId && gsi.GuildId == guildId);

if (gsi == null)
{
_logger.LogWarning("Player {PlayerId} ({PlayerName}) attempted to update unknown guild item {ItemId} for guild {GuildId}",
session.CharacterId, session.CharacterInfo!.CharacterName, itemId, guildId);

return SingleMessageAsync(new UpdateGuildShopItemResponse().Build());
}

gsi.Price = generalPrice;
gsi.MemberPrice = memberPrice;
gsi.AvailableForGeneral = allowGeneral;
gsi.AvailableForMember = allowMember;

_logger.LogWarning("Player {PlayerId} ({PlayerName}) updated availability/price to: General: {GeneralPrice}({AvailableGeneral}) Member: {MemberPrice}({AvailableMember}) for item {ItemId} in guild {GuildId}",
session.CharacterId, session.CharacterInfo!.CharacterName, generalPrice, allowGeneral, memberPrice, allowMember, itemId, guildId);

await _database.SaveChangesAsync();

return SingleMessageAsync(new UpdateGuildShopItemResponse().Build());
}
}
5 changes: 4 additions & 1 deletion ...t.NetSlum.Networking/Packets/Response/Guilds/UpdateGuildItemPricingAvailabilityRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public override async ValueTask<ICollection<FragmentMessage>> GetResponse(Fragme
.AsNoTracking()
.FirstOrDefaultAsync(g => g.Id == session.GuildId);

var isGuildMaster = guild != null && guild.LeaderId == session.GuildId;
var isGuildMaster = guild != null && guild.LeaderId == session.CharacterId;

var donatedItem = _guildShopContextAccessor.Current.Donation;

Expand Down Expand Up @@ -70,6 +70,9 @@ public override async ValueTask<ICollection<FragmentMessage>> GetResponse(Fragme

if (isGuildMaster)
{
_logger.LogWarning("Player {PlayerId} ({PlayerName}) is guild master for guild {GuildId}. Setting availability/price to: General: {GeneralPrice}({AvailableGeneral}) Member: {MemberPrice}({AvailableMember})",
session.CharacterId, session.CharacterInfo!.CharacterName, session.GuildId, generalPrice, isGeneral, memberPrice, isMember);

guildItem.Price = generalPrice;
guildItem.MemberPrice = memberPrice;
guildItem.AvailableForGeneral = isGeneral;
Expand Down
4 changes: 4 additions & 0 deletions src/Fragment.NetSlum.Networking/Sessions/FragmentTcpSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using Fragment.NetSlum.Networking.Objects;
using Fragment.NetSlum.Networking.Pipeline;
using Fragment.NetSlum.Networking.Stores;
using Fragment.NetSlum.Persistence;
using Fragment.NetSlum.TcpServer;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
Expand Down Expand Up @@ -134,6 +135,9 @@ protected override async Task OnReceived(Memory<byte> data, CancellationToken ca
/// <returns></returns>
protected internal void Send(List<FragmentMessage> data)
{
// To keep entities from becoming stale and save memory, clear the EF change tracker.
ServiceScope.ServiceProvider.GetRequiredService<FragmentContext>().ChangeTracker.Clear();

var respData = _packetPipeline.Encode(data, CancellationToken.None).Span;

Send(respData);
Expand Down
2 changes: 1 addition & 1 deletion src/Fragment.NetSlum.Persistence/Fragment.NetSlum.Persistence.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="EntityFrameworkCore.Exceptions.MySQL.Pomelo" Version="8.1.3" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.8" />
<PackageReference Include="ZiggyCreatures.FusionCache" Version="2.6.0" />
</ItemGroup>

Expand Down
30 changes: 15 additions & 15 deletions src/Fragment.NetSlum.Server/Fragment.NetSlum.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,29 @@
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.System" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
<PackageReference Include="FastEndpoints" Version="8.0.1" />
<PackageReference Include="FastEndpoints.Security" Version="8.0.1" />
<PackageReference Include="FastEndpoints.Swagger" Version="8.0.1" />
<PackageReference Include="Haukcode.HighResolutionTimer" Version="1.4.55" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.11.1" />
<PackageReference Include="FastEndpoints" Version="8.1.0" />
<PackageReference Include="FastEndpoints.Security" Version="8.1.0" />
<PackageReference Include="FastEndpoints.Swagger" Version="8.1.0" />
<PackageReference Include="Haukcode.HighResolutionTimer" Version="1.4.56" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.13.1" />
<PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.14">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.16">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.14" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.5" />
<PackageReference Include="NSwag.AspNetCore" Version="14.6.3" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.16" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.8" />
<PackageReference Include="NSwag.AspNetCore" Version="14.7.1" />
<PackageReference Include="Riok.Mapperly" Version="4.3.1" />
<PackageReference Include="Scalar.AspNetCore" Version="2.13.14" />
<PackageReference Include="Scalar.AspNetCore" Version="2.14.14" />
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.9.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />
Expand Down
4 changes: 2 additions & 2 deletions test/Fragment.NetSlum.Networking.Test/Fragment.NetSlum.Networking.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
<PackageReference Include="NSubstitute" Version="5.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="8.0.1">
<PackageReference Include="coverlet.collector" Version="10.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down