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

More predicted virtual item fixes (#15049)

Browse Source
This commit is contained in:
Leon Friedrich
2023-04-02 07:49:26 +12:00
committed by GitHub
parent 9d65cb7441
commit b11c8d4df8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Hands/SharedHandVirtualItemSystem.cs
View File

@@ -27,7 +27,7 @@ public abstract class SharedHandVirtualItemSystem : EntitySystem
public bool TrySpawnVirtualItemInHand(EntityUid blockingEnt, EntityUid user, [NotNullWhen(true)] out EntityUid? virtualItem) public bool TrySpawnVirtualItemInHand(EntityUid blockingEnt, EntityUid user, [NotNullWhen(true)] out EntityUid? virtualItem)
{ {
if (!_hands.TryGetEmptyHand(user, out var hand)) if (_net.IsClient || !_hands.TryGetEmptyHand(user, out var hand))
{ {
virtualItem = null; virtualItem = null;
return false; return false;
@@ -81,6 +81,9 @@ public abstract class SharedHandVirtualItemSystem : EntitySystem
/// </summary> /// </summary>
public void Delete(HandVirtualItemComponent comp, EntityUid user) public void Delete(HandVirtualItemComponent comp, EntityUid user)
{ {
if (_net.IsClient)
return;
var userEv = new VirtualItemDeletedEvent(comp.BlockingEntity, user); var userEv = new VirtualItemDeletedEvent(comp.BlockingEntity, user);
RaiseLocalEvent(user, userEv); RaiseLocalEvent(user, userEv);
var targEv = new VirtualItemDeletedEvent(comp.BlockingEntity, user); var targEv = new VirtualItemDeletedEvent(comp.BlockingEntity, user);