Skip to content

Commit

Permalink
Merge branch 'Individual-hands' of https://github.com/stilnat/SS3D in…
Browse files Browse the repository at this point in the history
…to Individual-hands
  • Loading branch information
stilnat committed Aug 10, 2023
2 parents 18e4680 + 33f0c39 commit 47b3153
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ public class AddHandCommand : Command
public override ServerRoleTypes AccessLevel => ServerRoleTypes.Administrator;

public override CommandType Type => CommandType.Server;

public GameObject hand;

public override string Perform(string[] args, NetworkConnection conn)
{
CheckArgsResponse checkArgsResponse = CheckArgs(args);
Expand Down
4 changes: 0 additions & 4 deletions Assets/Scripts/SS3D/Systems/Inventory/Containers/Hand.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
using SS3D.Systems.Inventory.Containers;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using SS3D.Systems.Inventory.Items;
using System.Linq;
using SS3D.Interactions.Interfaces;
using SS3D.Interactions;
using FishNet.Object;
using static SS3D.Systems.Inventory.Containers.AttachedContainer;

namespace SS3D.Systems.Inventory.Containers
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ private SingleItemContainerSlot AddHorizontalLayoutSlot(GameObject prefab, Conta
/// <returns> The transform of the hand slot at the specified index.</returns>
public Transform GetHandSlot(Hand hand)
{
var slot = Slots.Find(x => x.Container == hand.Container);
SingleItemContainerSlot slot = Slots.Find(x => x.Container == hand.Container);
return slot.transform;
}

Expand Down

0 comments on commit 47b3153

Please sign in to comment.