tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates submodule (#22)

Browse Source 
* Updates submodule

Fix connect not entering server (with correct toml config) and compile error, updates submodule
Server still has an issue with toml file pointing towards sandbox instead of content and roundstart object initializations

* Updates more stuff

Needs my most recent PR on ss14 to function

* Submodule updated for real this time
This commit is contained in:
clusterfack
2018-01-18 13:00:35 -06:00
committed by Pieter-Jan Briers
parent 37091d1254
commit 5ee56a4cd3
5 changed files with 153 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/UserInterface/HandsGui.cs
View File

@@ -55,12 +55,12 @@ namespace Content.Client.UserInterface
protected override void DrawContents()
{
if (_playerManager?.ControlledEntity == null)
if (_playerManager?.LocalPlayer.ControlledEntity == null)
{
return;
}
IEntity entity = _playerManager.ControlledEntity;
IEntity entity = _playerManager.LocalPlayer.ControlledEntity;
if (!entity.TryGetComponent<IHandsComponent>(out var hands))
{
return;
@@ -99,12 +99,12 @@ namespace Content.Client.UserInterface
public void UpdateHandIcons()
{
if (_playerManager?.ControlledEntity == null)
if (_playerManager?.LocalPlayer.ControlledEntity == null)
{
return;
}
IEntity entity = _playerManager.ControlledEntity;
IEntity entity = _playerManager.LocalPlayer.ControlledEntity;
if (!entity.TryGetComponent<IHandsComponent>(out var hands))
{
return;
@@ -144,7 +144,7 @@ namespace Content.Client.UserInterface
private void SendSwitchHandTo(string index)
{
IEntity entity = _playerManager.ControlledEntity;
IEntity entity = _playerManager.LocalPlayer.ControlledEntity;
if (!entity.TryGetComponent<IHandsComponent>(out var hands))
{
return;