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

1.3h

Browse Source 
- Changed knife remove method
- Fixed (?) exception with cooldown
This commit is contained in:
Dawid Bepierszcz
2023-12-25 15:45:32 +01:00
parent cd059c6bfb
commit 24fcfa0222
7 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Events.cs
View File

@@ -37,12 +37,16 @@ namespace WeaponPaints
{
CCSPlayerController player = Utilities.GetPlayerFromSlot(playerSlot);
if (player == null || !player.IsValid || player.IsBot || player.IsHLTV) return;
if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.UserId == null) return;
if (Config.Additional.KnifeEnabled)
g_playersKnife.Remove((int)player.Index);
if (Config.Additional.SkinEnabled)
gPlayerWeaponsInfo.Remove((int)player.Index);
if (commandsCooldown.ContainsKey((int)player.UserId))
{
commandsCooldown.Remove((int)player.UserId);
}
}
private void OnEntityCreated(CEntityInstance entity)
@@ -91,28 +95,22 @@ namespace WeaponPaints
return HookResult.Continue;
}
/*
private HookResult OnItemPickup(EventItemPickup @event, GameEventInfo info)
{
if (@event.Defindex == 42 || @event.Defindex == 59)
{
Server.PrintToChatAll("test1");
CCSPlayerController? player = @event.Userid;
if (player == null || !player.IsValid || !g_knifePickupCount.ContainsKey((int)player.Index) || player.IsBot || !g_playersKnife.ContainsKey((int)player.Index))
return HookResult.Continue;
Server.PrintToChatAll("test2");
if (g_knifePickupCount[(int)player.Index] >= 2) return HookResult.Continue;
Server.PrintToChatAll("test3");
if (g_playersKnife.ContainsKey((int)player.Index)
&&
g_playersKnife[(int)player.Index] != "weapon_knife")
{
Server.PrintToChatAll("usuwam noz");
g_knifePickupCount[(int)player.Index]++;
RemovePlayerKnife(player, true);
@@ -123,6 +121,7 @@ namespace WeaponPaints
}
return HookResult.Continue;
}
*/
public HookResult OnPickup(CEntityIOOutput output, string name, CEntityInstance activator, CEntityInstance caller, CVariant value, float delay)
{
@@ -145,15 +144,14 @@ namespace WeaponPaints
if (g_playersKnife[(int)player.Index] != "weapon_knife")
{
g_knifePickupCount[(int)player.Index]++;
weapon.Remove();
if (!PlayerHasKnife(player) && Config.Additional.GiveKnifeAfterRemove)
player.RemoveItemByDesignerName(weapon.DesignerName);
if (Config.Additional.GiveKnifeAfterRemove)
AddTimer(0.2f, () => GiveKnifeToPlayer(player));
}
return HookResult.Continue;
}
private void OnMapStart(string mapName)
{
if (!Config.Additional.KnifeEnabled) return;
@@ -236,7 +234,7 @@ namespace WeaponPaints
return HookResult.Continue;
}
if (Config.Additional.KnifeEnabled)
if (Config.Additional.KnifeEnabled && !PlayerHasKnife(player))
{
g_knifePickupCount[(int)player.Index] = 0;
AddTimer(0.1f, () => GiveKnifeToPlayer(player));