KillingFloor2/KF2-YetAnotherScoreboard
KillingFloor2/KF2-YetAnotherScoreboard
1
0
Fork 0
Code Releases 7 Activity

fix frozen damage after rejoin

Browse Source
This commit is contained in:
GenZmeY 2022-10-23 03:02:54 +03:00
parent a2fba687d4
commit f91f6d3407
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
YAS/Classes/YAS.uc
View File

@ -343,8 +343,8 @@ public function NotifyLogout(Controller C)
public function YAS_RepInfoOwner CreateRepInfo(Controller C) public function YAS_RepInfoOwner CreateRepInfo(Controller C)
{ {
local YAS_RepInfoOwner OwnerRepInfo; local YAS_RepInfoOwner OwnerRepInfo;
local YAS_RepInfoPlayer PlayerRepInfo; local YAS_RepInfoPlayer PlayerRepInfo;
`Log_Trace(); `Log_Trace();
@ -355,7 +355,7 @@ public function YAS_RepInfoOwner CreateRepInfo(Controller C)
{ {
RepInfos.AddItem(OwnerRepInfo); RepInfos.AddItem(OwnerRepInfo);
OwnerRepInfo.PlayerRepInfo = PlayerRepInfo; OwnerRepInfo.PlayerRepInfo = PlayerRepInfo;
OwnerRepInfo.YAS = Self; OwnerRepInfo.YAS = Self;
OwnerRepInfo.LogLevel = LogLevel; OwnerRepInfo.LogLevel = LogLevel;
OwnerRepInfo.RankPlayer = CfgRanks.default.Player; OwnerRepInfo.RankPlayer = CfgRanks.default.Player;

19
YAS/Classes/YAS_ScoreBoard.uc
View File

@ -73,7 +73,12 @@ function YAS_RepInfoPlayer FindRepInfo(KFPlayerReplicationInfo KFPRI)
{ {
if (RepInfo.UID.Uid == KFPRI.UniqueId.Uid) if (RepInfo.UID.Uid == KFPRI.UniqueId.Uid)
{ {
return RepInfo; if (RepInfo.bPendingDelete || RepInfo.bDeleteMe)
{
RepInfos.RemoveItem(RepInfo);
break;
}
else return RepInfo;
} }
} }
@ -81,6 +86,8 @@ function YAS_RepInfoPlayer FindRepInfo(KFPlayerReplicationInfo KFPRI)
{ {
if (RepInfo.UID.Uid == KFPRI.UniqueId.Uid) if (RepInfo.UID.Uid == KFPRI.UniqueId.Uid)
{ {
if (RepInfo.bPendingDelete || RepInfo.bDeleteMe) continue;
RepInfos.AddItem(RepInfo); RepInfos.AddItem(RepInfo);
return RepInfo; return RepInfo;
} }
@ -615,7 +622,7 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float
ShapeHealth = Settings.Style.ShapeStateHealthBoxMidPlayer; ShapeHealth = Settings.Style.ShapeStateHealthBoxMidPlayer;
if (!KFGRI.bMatchHasBegun) if (!(KFGRI.bMatchHasBegun || KFGRI.bTraderIsOpen || KFGRI.bWaveIsActive))
{ {
HealthBoxColor = Settings.Style.StateBoxColorLobby; HealthBoxColor = Settings.Style.StateBoxColorLobby;
} }
@ -638,7 +645,7 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float
EdgeSize, EdgeSize,
ShapeHealth); ShapeHealth);
if (!KFGRI.bMatchHasBegun) if (!(KFGRI.bMatchHasBegun || KFGRI.bTraderIsOpen || KFGRI.bWaveIsActive))
{ {
ColorTMP = Settings.Style.ListHeaderTextColor; ColorTMP = Settings.Style.ListHeaderTextColor;
ColorTMP.A = 200; ColorTMP.A = 200;
@ -662,11 +669,9 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float
HealthWBox - BorderSize * 4, HealthWBox - BorderSize * 4,
Height - BorderSize * 4); Height - BorderSize * 4);
} }
else
C.SetDrawColorStruct(Settings.Style.StateTextColorHealthHigh);
if (KFPRI.PlayerHealth > 0)
{ {
C.SetDrawColorStruct(Settings.Style.StateTextColorHealthHigh);
DrawTextShadowHVCenter(String(KFPRI.PlayerHealth), HealthXPos, YOffset, HealthWBox, Height, FontScalar); DrawTextShadowHVCenter(String(KFPRI.PlayerHealth), HealthXPos, YOffset, HealthWBox, Height, FontScalar);
} }