Skip to content

Fix deregister attribute command #47

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

Merged
sunnamed434 merged 2 commits into from
Feb 28, 2024
Merged

Fix deregister attribute command #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2869c2
Fix deregister attribute command
sunnamed434 Feb 28, 2024
71e04b8
Fix the PR CI
sunnamed434 Feb 28, 2024
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
6 changes: 1 addition & 5 deletions .github/workflows/Rocket.Unturned.Module.PR.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ jobs:
dotnet-version: 7.x

- name: Build
run: dotnet build ./Rocket.Unturned/Rocket.Unturned.csproj \
/p:RocketModVersion=0.0.0-preview \
/p:CreateRocketModUnturnedModuleArtifacts=true \
-c Release \
-f net461
run: dotnet build ./Rocket.Unturned/Rocket.Unturned.csproj /p:RocketModVersion=0.0.0-preview /p:CreateRocketModUnturnedModuleArtifacts=true -c Release -f net461

- run: echo "::set-output name=commit_hash::$(git rev-parse --short ${{ github.sha }})"
id: commit_hash
Expand Down
4 changes: 2 additions & 2 deletions Rocket/Rocket.Core/Commands/RocketCommandManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public void Register(IRocketCommand command, string alias, CommandPriority prior

public void DeregisterFromAssembly(Assembly assembly)
{
commands.RemoveAll(rc => rc.Command.GetType().Assembly == assembly);
commands.RemoveAll(rc => getCommandType(rc.Command).Assembly == assembly);
}

public double GetCooldown(IRocketPlayer player, IRocketCommand command)
Expand Down Expand Up @@ -331,7 +331,7 @@ public void RegisterFromAssembly(Assembly assembly)
}
}
}

public class RegisteredRocketCommand : IRocketCommand
{
public Type Type;
Expand Down