Skip to content

Commit 0726fc8

Browse files
authored
Merge pull request #78 from obvEve/dev
Dev
2 parents 2c07d6c + 9972dd5 commit 0726fc8

File tree

6 files changed

+7
-20
lines changed

6 files changed

+7
-20
lines changed

.github/workflows/nuget.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ jobs:
2525
Invoke-WebRequest -Uri ${{ env.REFERENCES_URL }} -OutFile "${{ github.workspace }}/References.zip"
2626
Expand-Archive -Path "${{ github.workspace }}/References.zip" -DestinationPath ${{ env.REFERENCES_PATH }}
2727
28-
- name: Rename Assembly-CSharp-Publicized to Assembly-CSharp
29-
shell: pwsh
30-
run: |
31-
Rename-Item -Path "${{ env.REFERENCES_PATH }}\Assembly-CSharp-Publicized.dll" -NewName "Assembly-CSharp.dll"
32-
3328
- name: Build and Pack NuGet
3429
env:
3530
SL_REFERENCES: ${{ env.REFERENCES_PATH }}

.github/workflows/pull_request.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ jobs:
2525
run: |
2626
Invoke-WebRequest -Uri ${{ env.REFERENCES_URL }} -OutFile "${{ github.workspace }}/References.zip"
2727
Expand-Archive -Path "${{ github.workspace }}/References.zip" -DestinationPath ${{ env.REFERENCES_PATH }}
28-
29-
- name: Rename Assembly-CSharp-Publicized to Assembly-CSharp
30-
shell: pwsh
31-
run: |
32-
Rename-Item -Path "${{ env.REFERENCES_PATH }}\Assembly-CSharp-Publicized.dll" -NewName "Assembly-CSharp.dll"
3328
3429
- name: Build
3530
env:

SecretAPI.Examples/Settings/ExampleDropdownSetting.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected override void PersonalizeSetting()
3838
/// <inheritdoc/>
3939
protected override void HandleSettingUpdate()
4040
{
41-
Logger.Info($"{KnownOwner?.DisplayName ?? "null reference"} selected {SelectedOption} (Index {ValidatedSelectedIndex}/{Options.Length})");
41+
Logger.Info($"{KnownOwner?.DisplayName ?? "(Null Owner - What went wrong?)"} selected {SelectedOption} (Index {ValidatedSelectedIndex}/{Options.Length - 1})");
4242
}
4343
}
4444
}

SecretAPI.Examples/Settings/ExampleKeybindSetting.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
namespace SecretAPI.Examples.Settings
22
{
3+
using LabApi.Features.Wrappers;
34
using SecretAPI.Features.UserSettings;
45
using UnityEngine;
56

@@ -19,6 +20,9 @@ public ExampleKeybindSetting()
1920
/// <inheritdoc />
2021
public override CustomHeader Header => CustomHeader.Examples;
2122

23+
/// <inheritdoc/>
24+
protected override bool CanView(Player player) => player.RemoteAdminAccess;
25+
2226
/// <inheritdoc />
2327
protected override CustomSetting CreateDuplicate() => new ExampleKeybindSetting();
2428

SecretAPI/Extensions/MirrorExtensions.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using LabApi.Features.Console;
66
using LabApi.Features.Wrappers;
77
using Mirror;
8-
using Respawning;
98

109
/// <summary>
1110
/// Extensions related to Mirror.
@@ -21,6 +20,7 @@ public static class MirrorExtensions
2120
/// <param name="isNoisy">Whether the cassie is noisy.</param>
2221
/// <param name="isSubtitles">Whether there is subtitles on the cassie.</param>
2322
/// <param name="customSubtitles">The custom subtitles to use for the cassie.</param>
23+
[Obsolete("Due to NW changes to Cassie, this is no longer functional.")]
2424
public static void SendFakeCassieMessage(
2525
this Player target,
2626
string message,
@@ -29,13 +29,6 @@ public static void SendFakeCassieMessage(
2929
bool isSubtitles = true,
3030
string customSubtitles = "")
3131
{
32-
foreach (RespawnEffectsController allController in RespawnEffectsController.AllControllers)
33-
{
34-
if (!allController)
35-
continue;
36-
37-
SendFakeRpcMessage(target, allController, typeof(RespawnEffectsController), nameof(RespawnEffectsController.RpcCassieAnnouncement), message, isHeld, isNoisy, isSubtitles, customSubtitles);
38-
}
3932
}
4033

4134
/// <summary>

SecretAPI/SecretAPI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>net48</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<Nullable>enable</Nullable>
7-
<Version>2.0.2</Version>
7+
<Version>2.0.3</Version>
88
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
99
</PropertyGroup>
1010

0 commit comments

Comments
 (0)