Skip to content
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

Update dev #3

Merged
merged 7 commits into from
Mar 27, 2024
Merged

Update dev #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f772a7
ensure weapons are given by waiting for pawn to fully spawn
jithatsonei Mar 25, 2024
308fd49
my bosses say im silly for missing this
jithatsonei Mar 25, 2024
5edbe75
i really should enable c# in my codespace
jithatsonei Mar 25, 2024
b22791d
fix
jithatsonei Mar 25, 2024
edabd72
Merge pull request #1 from jithatsonei/main
MSWS Mar 25, 2024
fdc4b7f
swap to ticks over timer
jithatsonei Mar 25, 2024
013c30d
Merge pull request #2 from jithatsonei/main
MSWS Mar 27, 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
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: .NET Build and Release

permissions:
contents: write
on: push

jobs:
Expand Down
19 changes: 10 additions & 9 deletions WeaponsGiver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Core.Attributes;
using CounterStrikeSharp.API.Modules.Memory;
using CounterStrikeSharp.API.Modules.Entities.Constants;
using CounterStrikeSharp.API.Modules.Cvars;
using CounterStrikeSharp.API.Modules.Utils;

namespace WeaponsGiver
{
[MinimumApiVersion(175)]
[MinimumApiVersion(198)]
public class WeaponsGiver : BasePlugin
{
private string tPrimary;
Expand All @@ -21,7 +19,7 @@ public class WeaponsGiver : BasePlugin
public override string ModuleName => "WeaponsGiver";
public override string ModuleAuthor => "ji";
public override string ModuleDescription => "Ensures players in custom gamemodes spawn with starting weapons.";
public override string ModuleVersion => "build4";
public override string ModuleVersion => "build6";

public override void Load(bool hotReload)
{
Expand All @@ -48,9 +46,14 @@ private HookResult Event_RoundPrestart(EventRoundPrestart @event, GameEventInfo

private HookResult Event_PlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
{
var player = @event.Userid;

if(!player.IsValid || !player.PlayerPawn.IsValid) return HookResult.Continue;
Server.RunOnTick(Server.TickCount + 1, () => GiveWeapons(@event.Userid));
return HookResult.Continue;
}

private void GiveWeapons(CCSPlayerController player)
{
if(!player.IsValid || !player.PlayerPawn.IsValid) return;
if (player.Connected != PlayerConnectedState.PlayerConnected) return;

switch((CsTeam)player.TeamNum)
{
Expand All @@ -66,8 +69,6 @@ private HookResult Event_PlayerSpawn(EventPlayerSpawn @event, GameEventInfo info
if(!String.IsNullOrEmpty(ctMelee)) player.GiveNamedItem(ctMelee);
break;
}

return HookResult.Continue;
}
}
}
2 changes: 1 addition & 1 deletion WeaponsGiver.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.175" />
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.198" />
</ItemGroup>
</Project>
Loading