]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
More predicted virtual item fixes (#15049)
authorLeon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Sat, 1 Apr 2023 19:49:26 +0000 (07:49 +1200)
committerGitHub <noreply@github.com>
Sat, 1 Apr 2023 19:49:26 +0000 (05:49 +1000)
Content.Shared/Hands/SharedHandVirtualItemSystem.cs

index 037b36d4a87b376b7a483cf4cb13dc7221f93c41..f93d7292987fc148506ae5f9252a5b9539ee26f3 100644 (file)
@@ -27,7 +27,7 @@ public abstract class SharedHandVirtualItemSystem : EntitySystem
 
     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;
             return false;
@@ -81,6 +81,9 @@ public abstract class SharedHandVirtualItemSystem : EntitySystem
     /// </summary>
     public void Delete(HandVirtualItemComponent comp, EntityUid user)
     {
+        if (_net.IsClient)
+            return;
+
         var userEv = new VirtualItemDeletedEvent(comp.BlockingEntity, user);
         RaiseLocalEvent(user, userEv);
         var targEv = new VirtualItemDeletedEvent(comp.BlockingEntity, user);