Skip to content

Fixed missing check for ClientSimSettings Console Logging in ClientSi… #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DrakenStark wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed missing check for ClientSimSettings Console Logging in ClientSi… #135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion Source/Runtime/Helpers/ClientSimPickupHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,26 @@ public class ClientSimPickupHelper : ClientSimBehaviour, IClientSimPickupable
private VRC_Pickup.PickupHand _heldHand;
private Action<IClientSimPickupable> _forceDropHandler;

private static ClientSimSettings _settings;

private void OnEnable()
{
if (_settings == null)
{
_settings = ClientSimSettings.Instance;
}
}

public static void InitializePickup(VRC_Pickup pickup)
{
ClientSimPickupHelper previousHelper = pickup.gameObject.GetComponent<ClientSimPickupHelper>();
if (previousHelper != null)
{
DestroyImmediate(previousHelper);
pickup.LogWarning($"Destroying old pickup helper on object: {Tools.GetGameObjectPath(pickup.gameObject)}");
if (_settings.displayLogs)
{
pickup.LogWarning($"Destroying old pickup helper on object: {Tools.GetGameObjectPath(pickup.gameObject)}");
}
}

ClientSimPickupHelper helper = pickup.gameObject.AddComponent<ClientSimPickupHelper>();
Expand Down