GarpBot/cs2-WeaponPaints
1
0
Fork 0
mirror of https://github.com/Nereziel/cs2-WeaponPaints.git synced 2026-02-18 10:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #69 from daffyyyy/fix-knife-3

Browse Source 
TEMP FIX FOR KNIVES
This commit is contained in:
Nereziel
2023-11-26 18:30:24 +01:00
committed by GitHub
parent dcd68aed67 a42e9a37fc
commit 414818e314
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
WeaponPaints.cs
View File

@@ -111,6 +111,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn); RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre); RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre);
RegisterEventHandler<EventItemPickup>(OnItemPickup, HookMode.Pre); RegisterEventHandler<EventItemPickup>(OnItemPickup, HookMode.Pre);
RegisterEventHandler<EventItemRemove>(OnItemRemove);
if (hotReload) if (hotReload)
{ {
@@ -137,6 +138,13 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
LoadSkinsFromFile(ModuleDirectory + "/skins.json"); LoadSkinsFromFile(ModuleDirectory + "/skins.json");
} }
private HookResult OnItemRemove(EventItemRemove @event, GameEventInfo info)
{
Console.WriteLine(@event.Defindex);
return HookResult.Continue;
}
public void OnConfigParsed(WeaponPaintsConfig config) public void OnConfigParsed(WeaponPaintsConfig config)
{ {
if (!config.GlobalShare) if (!config.GlobalShare)
@@ -330,8 +338,8 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info) private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
{ {
var player = @event.Userid; CCSPlayerController? player = @event.Userid;
if (!player.IsValid || !player.PlayerPawn.IsValid) if (player == null || !player.IsValid || !player.PlayerPawn.IsValid)
{ {
return HookResult.Continue; return HookResult.Continue;
} }
@@ -528,7 +536,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
if (weapons != null && weapons.Count > 0) if (weapons != null && weapons.Count > 0)
{ {
CCSPlayer_ItemServices service = new CCSPlayer_ItemServices(player.PlayerPawn.Value.ItemServices.Handle); CCSPlayer_ItemServices service = new CCSPlayer_ItemServices(player.PlayerPawn.Value.ItemServices.Handle);
var dropWeapon = VirtualFunction.CreateVoid<nint, nint>(service.Handle, GameData.GetOffset("CCSPlayer_ItemServices_DropActivePlayerWeapon")); //var dropWeapon = VirtualFunction.CreateVoid<nint, nint>(service.Handle, GameData.GetOffset("CCSPlayer_ItemServices_DropActivePlayerWeapon"));
foreach (var weapon in weapons) foreach (var weapon in weapons)
{ {
@@ -538,12 +546,16 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet")) if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
{ {
NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot3"); NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot3");
AddTimer(0.2f, () => AddTimer(0.5f, () => service.DropActivePlayerWeapon(weapon.Value));
{
CEntityInstance knife = new(weapon.Value.Handle); /*
dropWeapon(service.Handle, weapon.Handle); CEntityInstance knife = new(weapon.Value.Handle);
AddTimer(0.3f, () => knife.Remove()); AddTimer(1.0f, () => {
knife.Remove();
if (knife != null && knife.IsValid && player.PawnIsAlive)
}); });
*/
break; break;
} }
} }
@@ -639,7 +651,9 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
if (player!.PawnIsAlive) if (player!.PawnIsAlive)
{ {
if (PlayerHasKnife(player)) if (PlayerHasKnife(player))
{
RemoveKnifeFromPlayer(player); RemoveKnifeFromPlayer(player);
}
g_changedKnife.Add((int)player.EntityIndex!.Value.Value); g_changedKnife.Add((int)player.EntityIndex!.Value.Value);
GiveKnifeToPlayer(player); GiveKnifeToPlayer(player);