v1.2.4.b1
This commit is contained in:
parent
12d04191f3
commit
273aa0ff59
11 changed files with 9 additions and 5 deletions
|
|
@ -111,6 +111,7 @@ namespace src.player.skills
|
||||||
foreach (var (info, player) in infoList)
|
foreach (var (info, player) in infoList)
|
||||||
{
|
{
|
||||||
if (player == null || !player.IsValid || player.Team == CsTeam.Spectator) continue;
|
if (player == null || !player.IsValid || player.Team == CsTeam.Spectator) continue;
|
||||||
|
if (!player.PawnIsAlive) continue;
|
||||||
|
|
||||||
var targetHandle = player.Pawn.Value?.ObserverServices?.ObserverTarget.Value?.Handle ?? nint.Zero;
|
var targetHandle = player.Pawn.Value?.ObserverServices?.ObserverTarget.Value?.Handle ?? nint.Zero;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -71,6 +71,7 @@ namespace src.player.skills
|
||||||
foreach (var (info, player) in infoList)
|
foreach (var (info, player) in infoList)
|
||||||
{
|
{
|
||||||
if (player == null || !player.IsValid || player.Team == CsTeam.Spectator) continue;
|
if (player == null || !player.IsValid || player.Team == CsTeam.Spectator) continue;
|
||||||
|
if (!player.PawnIsAlive) continue;
|
||||||
|
|
||||||
var targetHandle = player.Pawn.Value?.ObserverServices?.ObserverTarget.Value?.Handle ?? nint.Zero;
|
var targetHandle = player.Pawn.Value?.ObserverServices?.ObserverTarget.Value?.Handle ?? nint.Zero;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ namespace src.player.skills
|
||||||
|
|
||||||
foreach (var (info, player) in infoList)
|
foreach (var (info, player) in infoList)
|
||||||
{
|
{
|
||||||
if (player == null || !player.IsValid) continue;
|
if (player == null || !player.IsValid || !player.PawnIsAlive) continue;
|
||||||
var playerInfo = PlayerManager.GetPlayerByIndex((PlayerManager.GetPlayerEvent(player)?.Index ?? player.Index));
|
var playerInfo = PlayerManager.GetPlayerByIndex((PlayerManager.GetPlayerEvent(player)?.Index ?? player.Index));
|
||||||
|
|
||||||
if (playerInfo?.Skill != skillName)
|
if (playerInfo?.Skill != skillName)
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ namespace src.player.skills
|
||||||
|
|
||||||
foreach (var (info, player) in infoList)
|
foreach (var (info, player) in infoList)
|
||||||
{
|
{
|
||||||
if (player == null || !player.IsValid) continue;
|
if (player == null || !player.IsValid || !player.PawnIsAlive) continue;
|
||||||
|
|
||||||
var playerInfo = PlayerManager.GetPlayerByIndex((PlayerManager.GetPlayerEvent(player)?.Index ?? player.Index));
|
var playerInfo = PlayerManager.GetPlayerByIndex((PlayerManager.GetPlayerEvent(player)?.Index ?? player.Index));
|
||||||
bool isJackalOwner = playerInfo?.Skill == skillName;
|
bool isJackalOwner = playerInfo?.Skill == skillName;
|
||||||
|
|
|
||||||
|
|
@ -170,7 +170,7 @@ namespace src.player.skills
|
||||||
|
|
||||||
foreach (var (info, viewer) in infoList)
|
foreach (var (info, viewer) in infoList)
|
||||||
{
|
{
|
||||||
if (viewer == null || !viewer.IsValid) continue;
|
if (viewer == null || !viewer.IsValid || !viewer.PawnIsAlive) continue;
|
||||||
|
|
||||||
foreach (var kvp in targetVolumes)
|
foreach (var kvp in targetVolumes)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,7 @@ namespace src.player.skills
|
||||||
foreach (var (info, player) in infoList)
|
foreach (var (info, player) in infoList)
|
||||||
{
|
{
|
||||||
if (player == null || !player.IsValid || player.Team == CsTeam.Spectator) continue;
|
if (player == null || !player.IsValid || player.Team == CsTeam.Spectator) continue;
|
||||||
|
if (!player.PawnIsAlive) continue;
|
||||||
|
|
||||||
var targetHandle = player.Pawn.Value?.ObserverServices?.ObserverTarget.Value?.Handle ?? nint.Zero;
|
var targetHandle = player.Pawn.Value?.ObserverServices?.ObserverTarget.Value?.Handle ?? nint.Zero;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -444,7 +444,7 @@ namespace src.player.skills
|
||||||
|
|
||||||
foreach (var (info, player) in infoList)
|
foreach (var (info, player) in infoList)
|
||||||
{
|
{
|
||||||
if (player == null || !player.IsValid) continue;
|
if (player == null || !player.IsValid || !player.PawnIsAlive) continue;
|
||||||
|
|
||||||
uint viewerIndex = PlayerManager.GetPlayerEvent(player)?.Index ?? player.Index;
|
uint viewerIndex = PlayerManager.GetPlayerEvent(player)?.Index ?? player.Index;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ namespace src.player.skills
|
||||||
|
|
||||||
foreach (var (info, player) in infoList)
|
foreach (var (info, player) in infoList)
|
||||||
{
|
{
|
||||||
if (player == null || !player.IsValid) continue;
|
if (player == null || !player.IsValid || !player.PawnIsAlive) continue;
|
||||||
|
|
||||||
var playerInfo = PlayerManager.GetPlayerByIndex((PlayerManager.GetPlayerEvent(player)?.Index ?? player.Index));
|
var playerInfo = PlayerManager.GetPlayerByIndex((PlayerManager.GetPlayerEvent(player)?.Index ?? player.Index));
|
||||||
var targetHandle = player.Pawn.Value?.ObserverServices?.ObserverTarget?.Value?.Handle ?? nint.Zero;
|
var targetHandle = player.Pawn.Value?.ObserverServices?.ObserverTarget?.Value?.Handle ?? nint.Zero;
|
||||||
|
|
|
||||||
|
|
@ -802,6 +802,7 @@ namespace src.utils
|
||||||
|
|
||||||
var pawn = controller.PlayerPawn.Value;
|
var pawn = controller.PlayerPawn.Value;
|
||||||
if (pawn == null || !pawn.IsValid) continue;
|
if (pawn == null || !pawn.IsValid) continue;
|
||||||
|
if (pawn.LifeState != (byte)LifeState_t.LIFE_ALIVE || pawn.Health <= 0) continue;
|
||||||
|
|
||||||
hidden.Add(new HiddenPawn(controller.Index, controller.Team, pawn, bombOwnerIndex == controller.Index, ResolveCarriedIndexes(pawn)));
|
hidden.Add(new HiddenPawn(controller.Index, controller.Team, pawn, bombOwnerIndex == controller.Index, ResolveCarriedIndexes(pawn)));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue