bmgjet
/
Downed
mirror of https://github.com/bmgjet/Downed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug Fixes

This commit is contained in:
bmgjet 2022-06-06 19:44:41 +12:00 committed by GitHub
parent c37a23316c
commit 6c39ad77c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Downed.cs
View File

@ -156,7 +156,8 @@ namespace Oxide.Plugins
//Creates a timer to switches to crawl //Creates a timer to switches to crawl
downedPlayers.Add(player.userID, timer.Once(config.UIDelay, () => downedPlayers.Add(player.userID, timer.Once(config.UIDelay, () =>
{ {
if (player != null && !player.IsDead()) if (player == null) { return; }
if (!player.IsDead())
{ {
player.StopWounded(); //Reset the wounded state player.StopWounded(); //Reset the wounded state
downedPlayers[player.userID] = null; //Clear this timer downedPlayers[player.userID] = null; //Clear this timer
@ -208,13 +209,23 @@ namespace Oxide.Plugins
currentgun.primaryMagazine.contents = 0; currentgun.primaryMagazine.contents = 0;
var reloadloop = timer.Repeat(1.8f, config.NPCDownTimer, () => var reloadloop = timer.Repeat(1.8f, config.NPCDownTimer, () =>
{ {
currentgun.primaryMagazine.contents = 0; //Keep unloading so cant shoot. try
{
if (currentgun != null)
{
currentgun.primaryMagazine.contents = 0; //Keep unloading so cant shoot.
}
}
catch { }
}); });
timer.Once(config.NPCDownTimer + 5f, () => timer.Once(config.NPCDownTimer + 5f, () =>
{ {
try try
{ {
reloadloop.Destroy(); if (reloadloop != null)
{
reloadloop.Destroy();
}
} }
catch { } catch { }
}); });
@ -222,6 +233,7 @@ namespace Oxide.Plugins
} }
timer.Once(config.NPCDownTimer, () => timer.Once(config.NPCDownTimer, () =>
{ {
if (player == null) { return; }
if (player.IsAlive()) if (player.IsAlive())
{ {
//Chance of bleedout //Chance of bleedout
@ -290,8 +302,11 @@ namespace Oxide.Plugins
sph.LerpRadiusTo(0.01f, 1f); sph.LerpRadiusTo(0.01f, 1f);
timer.Once(1f, () => { timer.Once(1f, () => {
if (sph != null) if (sph != null)
{
sph.SetParent(player); sph.SetParent(player);
sph.transform.localPosition = new Vector3(0, -1.5f, 0f); sph.transform.localPosition = new Vector3(0, -1.5f, 0f);
}
if (boombox == null) { return; }
boombox.BoxController.CurrentRadioIp = url; boombox.BoxController.CurrentRadioIp = url;
boombox.BoxController.baseEntity.ClientRPC<string>(null, "OnRadioIPChanged", boombox.BoxController.CurrentRadioIp); boombox.BoxController.baseEntity.ClientRPC<string>(null, "OnRadioIPChanged", boombox.BoxController.CurrentRadioIp);
boombox.BoxController.ServerTogglePlay(true); boombox.BoxController.ServerTogglePlay(true);
@ -300,7 +315,9 @@ namespace Oxide.Plugins
try try
{ {
if (sph != null) if (sph != null)
{
sph?.Kill(); sph?.Kill();
}
} }
catch { } catch { }
}); });
@ -342,6 +359,7 @@ namespace Oxide.Plugins
} }
private void LongDown(BasePlayer player, bool downed = true) private void LongDown(BasePlayer player, bool downed = true)
{ {
if(player == null) { return; }
if (downed) //Down player if (downed) //Down player
{ {
player.BecomeWounded(); player.BecomeWounded();
@ -373,6 +391,7 @@ namespace Oxide.Plugins
{ {
try try
{ {
if (player == null) { return; }
if (!player.IsDead() && downedPlayers.ContainsKey(player.userID)) if (!player.IsDead() && downedPlayers.ContainsKey(player.userID))
{ {
GetUpTimer(player, "<color=red>Get UP IN</color> " + (config.Countdown - i).ToString()); GetUpTimer(player, "<color=red>Get UP IN</color> " + (config.Countdown - i).ToString());
@ -393,13 +412,16 @@ namespace Oxide.Plugins
catch { } catch { }
}); });
timer.Once(config.Countdown + 5f, () => timer.Once(config.Countdown + 5f, () =>
{ {
try try
{ {
countdowntimer.Destroy(); if (countdowntimer != null)
} {
catch { } countdowntimer.Destroy();
}); }
}
catch { }
});
if (downedPlayers.ContainsKey(player.userID)) if (downedPlayers.ContainsKey(player.userID))
{ {
downedPlayers.Remove(player.userID); downedPlayers.Remove(player.userID);