GarpBot/cs2-WeaponPaints
1
0
Fork 0
mirror of https://github.com/Nereziel/cs2-WeaponPaints.git synced 2026-02-28 21:44:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: GarpBot:build-43
Branches Tags
GarpBot:main GarpBot:dev GarpBot:test GarpBot:dbtest
GarpBot:build-411 GarpBot:build-408 GarpBot:build-406 GarpBot:build-399 GarpBot:build-396 GarpBot:build-395 GarpBot:build-394 GarpBot:build-392 GarpBot:build-391 GarpBot:build-389 GarpBot:build-386 GarpBot:build-387 GarpBot:build-380 GarpBot:build-378 GarpBot:build-373 GarpBot:build-370 GarpBot:build-368 GarpBot:build-366 GarpBot:build-362 GarpBot:build-359 GarpBot:build-355 GarpBot:build-353 GarpBot:build-349 GarpBot:build-346 GarpBot:build-344 GarpBot:build-342 GarpBot:build-340 GarpBot:build-338 GarpBot:build-336 GarpBot:build-334 GarpBot:build-332 GarpBot:build-329 GarpBot:build-327 GarpBot:build-324 GarpBot:build-319 GarpBot:build-320 GarpBot:build-316 GarpBot:build-314 GarpBot:build-312 GarpBot:build-309 GarpBot:build-307 GarpBot:build-299 GarpBot:build-297 GarpBot:build-291 GarpBot:build-290 GarpBot:build-289 GarpBot:build-288 GarpBot:build-287 GarpBot:build-284 GarpBot:build-281 GarpBot:build-277 GarpBot:build-275 GarpBot:build-273 GarpBot:build-271 GarpBot:build-269 GarpBot:build-266 GarpBot:build-261 GarpBot:build-257 GarpBot:build-254 GarpBot:build-252 GarpBot:build-240 GarpBot:build-238 GarpBot:build-231 GarpBot:build-227 GarpBot:build-224 GarpBot:build-222 GarpBot:build-216 GarpBot:build-214 GarpBot:build-212 GarpBot:build-210 GarpBot:build-206 GarpBot:build-204 GarpBot:build-202 GarpBot:build-200 GarpBot:build-197 GarpBot:build-195 GarpBot:build-193 GarpBot:build-191 GarpBot:build-188 GarpBot:build-184 GarpBot:build-182 GarpBot:build-180 GarpBot:build-178 GarpBot:build-176 GarpBot:build-174 GarpBot:build-172 GarpBot:dbtest-1 GarpBot:build-170 GarpBot:build-168 GarpBot:build-166 GarpBot:build-163 GarpBot:build-161 GarpBot:build-159 GarpBot:build-157 GarpBot:build-148 GarpBot:build-147 GarpBot:build-145 GarpBot:build-144 GarpBot:build-143 GarpBot:build-142 GarpBot:build-141 GarpBot:build-140 GarpBot:build-132 GarpBot:build-122 GarpBot:build-120 GarpBot:build-118 GarpBot:build-115 GarpBot:build-113 GarpBot:build-111 GarpBot:build-109 GarpBot:build-107 GarpBot:build-105 GarpBot:build-103 GarpBot:build-101 GarpBot:build-99 GarpBot:build-97 GarpBot:build-95 GarpBot:build-93 GarpBot:build-91 GarpBot:build-87 GarpBot:build-86 GarpBot:build-84 GarpBot:build-81 GarpBot:build-77 GarpBot:build-76 GarpBot:build-75 GarpBot:build-74 GarpBot:build-73 GarpBot:build-71 GarpBot:build-67 GarpBot:build-65 GarpBot:build-63 GarpBot:build-61 GarpBot:build-59 GarpBot:build-60 GarpBot:build-57 GarpBot:build-55 GarpBot:build-54 GarpBot:build-53 GarpBot:build-52 GarpBot:build-49 GarpBot:build-46 GarpBot:build-43 GarpBot:build-40 GarpBot:build-39 GarpBot:build-35 GarpBot:build-34 GarpBot:build-32 GarpBot:build-30 GarpBot:build-27 GarpBot:build-26 GarpBot:build-25 GarpBot:build-24 GarpBot:build-17 GarpBot:build-16 GarpBot:build-15 GarpBot:build-14 GarpBot:build-13 GarpBot:build-12 GarpBot:build-10 GarpBot:build-9 GarpBot:build-3 GarpBot:build-1
...
compare: GarpBot:build-46
Branches Tags
GarpBot:main GarpBot:dev GarpBot:test GarpBot:dbtest
GarpBot:build-411 GarpBot:build-408 GarpBot:build-406 GarpBot:build-399 GarpBot:build-396 GarpBot:build-395 GarpBot:build-394 GarpBot:build-392 GarpBot:build-391 GarpBot:build-389 GarpBot:build-386 GarpBot:build-387 GarpBot:build-380 GarpBot:build-378 GarpBot:build-373 GarpBot:build-370 GarpBot:build-368 GarpBot:build-366 GarpBot:build-362 GarpBot:build-359 GarpBot:build-355 GarpBot:build-353 GarpBot:build-349 GarpBot:build-346 GarpBot:build-344 GarpBot:build-342 GarpBot:build-340 GarpBot:build-338 GarpBot:build-336 GarpBot:build-334 GarpBot:build-332 GarpBot:build-329 GarpBot:build-327 GarpBot:build-324 GarpBot:build-319 GarpBot:build-320 GarpBot:build-316 GarpBot:build-314 GarpBot:build-312 GarpBot:build-309 GarpBot:build-307 GarpBot:build-299 GarpBot:build-297 GarpBot:build-291 GarpBot:build-290 GarpBot:build-289 GarpBot:build-288 GarpBot:build-287 GarpBot:build-284 GarpBot:build-281 GarpBot:build-277 GarpBot:build-275 GarpBot:build-273 GarpBot:build-271 GarpBot:build-269 GarpBot:build-266 GarpBot:build-261 GarpBot:build-257 GarpBot:build-254 GarpBot:build-252 GarpBot:build-240 GarpBot:build-238 GarpBot:build-231 GarpBot:build-227 GarpBot:build-224 GarpBot:build-222 GarpBot:build-216 GarpBot:build-214 GarpBot:build-212 GarpBot:build-210 GarpBot:build-206 GarpBot:build-204 GarpBot:build-202 GarpBot:build-200 GarpBot:build-197 GarpBot:build-195 GarpBot:build-193 GarpBot:build-191 GarpBot:build-188 GarpBot:build-184 GarpBot:build-182 GarpBot:build-180 GarpBot:build-178 GarpBot:build-176 GarpBot:build-174 GarpBot:build-172 GarpBot:dbtest-1 GarpBot:build-170 GarpBot:build-168 GarpBot:build-166 GarpBot:build-163 GarpBot:build-161 GarpBot:build-159 GarpBot:build-157 GarpBot:build-148 GarpBot:build-147 GarpBot:build-145 GarpBot:build-144 GarpBot:build-143 GarpBot:build-142 GarpBot:build-141 GarpBot:build-140 GarpBot:build-132 GarpBot:build-122 GarpBot:build-120 GarpBot:build-118 GarpBot:build-115 GarpBot:build-113 GarpBot:build-111 GarpBot:build-109 GarpBot:build-107 GarpBot:build-105 GarpBot:build-103 GarpBot:build-101 GarpBot:build-99 GarpBot:build-97 GarpBot:build-95 GarpBot:build-93 GarpBot:build-91 GarpBot:build-87 GarpBot:build-86 GarpBot:build-84 GarpBot:build-81 GarpBot:build-77 GarpBot:build-76 GarpBot:build-75 GarpBot:build-74 GarpBot:build-73 GarpBot:build-71 GarpBot:build-67 GarpBot:build-65 GarpBot:build-63 GarpBot:build-61 GarpBot:build-59 GarpBot:build-60 GarpBot:build-57 GarpBot:build-55 GarpBot:build-54 GarpBot:build-53 GarpBot:build-52 GarpBot:build-49 GarpBot:build-46 GarpBot:build-43 GarpBot:build-40 GarpBot:build-39 GarpBot:build-35 GarpBot:build-34 GarpBot:build-32 GarpBot:build-30 GarpBot:build-27 GarpBot:build-26 GarpBot:build-25 GarpBot:build-24 GarpBot:build-17 GarpBot:build-16 GarpBot:build-15 GarpBot:build-14 GarpBot:build-13 GarpBot:build-12 GarpBot:build-10 GarpBot:build-9 GarpBot:build-3 GarpBot:build-1

3 Commits
build-43 ... build-46

Author SHA1 Message Date
Nereziel
a6d4108ca7 Merge pull request #37 from daffyyyy/hotfix-2 
Fixed server crashing
 2023-11-16 20:51:10 +01:00
Dawid Bepierszcz
7b45169d8d Update WeaponPaints.cs 
Typo
 2023-11-16 20:42:20 +01:00
Dawid Bepierszcz
42bd45c3f0 Update WeaponPaints.cs 
Fixed crashing
 2023-11-16 20:38:35 +01:00
1 changed files with 37 additions and 34 deletions
Expand all files Collapse all files

71
WeaponPaints.cs
View File

@@ -195,37 +195,39 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
} }
Server.NextFrame(() => Server.NextFrame(() =>
{ {
if (!weapon.IsValid) return; try {
if (weapon.OwnerEntity.Value == null) return; if (!weapon.IsValid) return;
if (!weapon.OwnerEntity.Value.EntityIndex.HasValue) return; if (weapon.OwnerEntity.Value == null) return;
int weaponOwner = (int)weapon.OwnerEntity.Value.EntityIndex.Value.Value; if (!weapon.OwnerEntity.Value.EntityIndex.HasValue) return;
var pawn = new CBasePlayerPawn(NativeAPI.GetEntityFromIndex(weaponOwner)); int weaponOwner = (int)weapon.OwnerEntity.Value.EntityIndex.Value.Value;
if (!pawn.IsValid) return; var pawn = new CBasePlayerPawn(NativeAPI.GetEntityFromIndex(weaponOwner));
var playerIndex = (int)pawn.Controller.Value.EntityIndex!.Value.Value; if (!pawn.IsValid) return;
var player = Utilities.GetPlayerFromIndex(playerIndex); var playerIndex = (int)pawn.Controller.Value.EntityIndex!.Value.Value;
if (player == null || !player.IsValid || player.IsBot) return; var player = Utilities.GetPlayerFromIndex(playerIndex);
// TODO: Remove knife crashes here, needs another solution if (player == null || !player.IsValid || player.IsBot) return;
/*if (isKnife && g_playersKnife[(int)player.EntityIndex!.Value.Value] != "weapon_knife" && (weapon.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.AttributeManager.Item.ItemDefinitionIndex == 59)) // TODO: Remove knife crashes here, needs another solution
{ /*if (isKnife && g_playersKnife[(int)player.EntityIndex!.Value.Value] != "weapon_knife" && (weapon.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.AttributeManager.Item.ItemDefinitionIndex == 59))
RemoveKnifeFromPlayer(player); {
return; RemoveKnifeFromPlayer(player);
}*/ return;
var steamId = new SteamID(player.SteamID); }*/
if (!gPlayerWeaponPaints.ContainsKey(steamId.SteamId64)) return; var steamId = new SteamID(player.SteamID);
if (!gPlayerWeaponPaints[steamId.SteamId64].ContainsKey(weapon.AttributeManager.Item.ItemDefinitionIndex)) return; if (!gPlayerWeaponPaints.ContainsKey(steamId.SteamId64)) return;
//Log($"Apply on {weapon.DesignerName}({weapon.AttributeManager.Item.ItemDefinitionIndex}) paint {gPlayerWeaponPaints[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]} seed {gPlayerWeaponSeed[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]} wear {gPlayerWeaponWear[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]}"); if (!gPlayerWeaponPaints[steamId.SteamId64].ContainsKey(weapon.AttributeManager.Item.ItemDefinitionIndex)) return;
weapon.AttributeManager.Item.ItemID = 16384; //Log($"Apply on {weapon.DesignerName}({weapon.AttributeManager.Item.ItemDefinitionIndex}) paint {gPlayerWeaponPaints[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]} seed {gPlayerWeaponSeed[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]} wear {gPlayerWeaponWear[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]}");
weapon.AttributeManager.Item.ItemIDLow = 16384 & 0xFFFFFFFF; weapon.AttributeManager.Item.ItemID = 16384;
weapon.AttributeManager.Item.ItemIDHigh = weapon.AttributeManager.Item.ItemIDLow >> 32; weapon.AttributeManager.Item.ItemIDLow = 16384 & 0xFFFFFFFF;
weapon.FallbackPaintKit = gPlayerWeaponPaints[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]; weapon.AttributeManager.Item.ItemIDHigh = weapon.AttributeManager.Item.ItemIDLow >> 32;
weapon.FallbackSeed = gPlayerWeaponSeed[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]; weapon.FallbackPaintKit = gPlayerWeaponPaints[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex];
weapon.FallbackWear = gPlayerWeaponWear[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]; weapon.FallbackSeed = gPlayerWeaponSeed[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex];
if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null) weapon.FallbackWear = gPlayerWeaponWear[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex];
{ if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
var skeleton = GetSkeletonInstance(weapon.CBodyComponent.SceneNode); {
skeleton.ModelState.MeshGroupMask = 2; var skeleton = GetSkeletonInstance(weapon.CBodyComponent.SceneNode);
} skeleton.ModelState.MeshGroupMask = 2;
}); }
} catch(Exception) {}
});
} }
public void GiveKnifeToPlayer(CCSPlayerController player) public void GiveKnifeToPlayer(CCSPlayerController player)
{ {
@@ -267,6 +269,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
} }
public void RefreshPlayerKnife(CCSPlayerController player) public void RefreshPlayerKnife(CCSPlayerController player)
{ {
if (!player.IsValid || !player.PawnIsAlive) return;
if (!PlayerHasKnife(player)) if (!PlayerHasKnife(player))
GiveKnifeToPlayer(player); GiveKnifeToPlayer(player);
} }
@@ -320,11 +323,11 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
public bool PlayerHasKnife(CCSPlayerController player) public bool PlayerHasKnife(CCSPlayerController player)
{ {
if (!Config.Additional.KnifeEnabled) return true; if (!Config.Additional.KnifeEnabled) return false;
if (!player.IsValid || !player.PlayerPawn.IsValid) if (!player.IsValid || !player.PawnIsAlive)
{ {
return true; return false;
} }
var weapons = player.PlayerPawn.Value.WeaponServices!.MyWeapons; var weapons = player.PlayerPawn.Value.WeaponServices!.MyWeapons;