Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Upstream fixes (#664)

Browse Source 
* fix weird name saving

* fix item status

* Fix single-user BUIs erroneously closing (#28375)

(cherry picked from commit 08952b467d9b2b2db85cb9ebb4e8b628c0145716)

* fix meatyore shop

* possible playtime fix

* fixes

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
ThereDrD
2024-08-25 01:37:24 +03:00
committed by GitHub
parent dba9565865
commit 1b07a035ce
8 changed files with 67 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs
View File

@@ -1,4 +1,5 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Server.Chat.Managers;
using System.Net.Http;
@@ -29,6 +30,7 @@ using Robust.Shared.Configuration;
using Robust.Shared.Map;
using Robust.Shared.Network;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
namespace Content.Server._White.MeatyOre;
@@ -46,6 +48,7 @@ public sealed class MeatyOreStoreSystem : EntitySystem
[Dependency] private readonly SharedJobSystem _jobSystem = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly GameTicker _gameTicker = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
private HttpClient _httpClient = default!;
private string _apiUrl = default!;
@@ -149,7 +152,7 @@ public sealed class MeatyOreStoreSystem : EntitySystem
return;
_pvsOverrideSystem.AddSessionOverride(storeEntity.Value, playerSession);
_storeSystem.ToggleUi(playerEntity.Value, storeEntity.Value, storeComponent);
_storeSystem.ToggleUi(playerEntity.Value, storeEntity.Value);
}
private bool TryGetStore(ICommonSession session, out StoreComponent store, [NotNullWhen(true)] out EntityUid? storeEntity)
@@ -187,19 +190,19 @@ public sealed class MeatyOreStoreSystem : EntitySystem
private (EntityUid, StoreComponent) CreateStore(NetUserId userId, int balance)
{
var session = _playerManager.GetSessionById(userId);
var storeEntity = _entityManager.SpawnEntity("StoreMeatyOreEntity", MapCoordinates.Nullspace);
var storeComponent = Comp<StoreComponent>(storeEntity);
var user = session.AttachedEntity!;
_storeSystem.InitializeFromPreset(StorePresetPrototype, storeEntity, storeComponent);
var storeComponent = Comp<StoreComponent>(user.Value);
_storeSystem.InitializeFromPreset(StorePresetPrototype, user.Value, storeComponent);
storeComponent.Balance.Clear();
_storeSystem.TryAddCurrency(new Dictionary<string, FixedPoint2> { { MeatyOreCurrencyPrototype, balance } },
storeEntity, storeComponent);
user.Value, storeComponent);
_meatyOreStores[userId] = (storeEntity, storeComponent);
_pvsOverrideSystem.AddSessionOverride(storeEntity, session);
_meatyOreStores[userId] = (user.Value, storeComponent);
return (storeEntity, storeComponent);
return (user.Value, storeComponent);
}
private async void TryAddRole(EntityUid user, EntityUid target, StoreComponent store, EntityUid storeEntity)