aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/spawnschutz' into 'master'

Browse Source 
Hotfix/spawnschutz

See merge request log-gtav/reallife-gamemode!66
This commit is contained in:
hydrant
2021-04-30 22:44:52 +00:00
parent 58a1124922 5dbbf508f3
commit b758db3401
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReallifeGamemode.Client/Player/spawnschutz.ts
View File

@@ -16,6 +16,7 @@ export default function spawnschutz() {
}); });
mp.events.add("triggerSpawnschutzTimer", () => { mp.events.add("triggerSpawnschutzTimer", () => {
clearInterval(spawnschutzTimer);
spawnschutzTimer = setTimeout(() => { spawnschutzTimer = setTimeout(() => {
mp.events.call("toggleSpawnschutz", false); mp.events.call("toggleSpawnschutz", false);
spawnschutzEnabled = false; spawnschutzEnabled = false;

21
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -545,6 +545,27 @@ namespace ReallifeGamemode.Server.Commands
#region Admin #region Admin
[Command("remspawnschutz", "~m~Benutzung: ~s~/rmss [Target]")]
public void CmdAdminRmss(Player player, String targetname)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
Player target = PlayerService.GetPlayerByNameOrId(targetname);
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
}
target.TriggerEvent("abortSpawnschutz");
}
[Command("countdown", "~m~Benutzung: ~s~/countdown [Zeit] [Text]", GreedyArg = true)] [Command("countdown", "~m~Benutzung: ~s~/countdown [Zeit] [Text]", GreedyArg = true)]
public void CmdAdminCountdown(Player player, string timer_string, string text) public void CmdAdminCountdown(Player player, string timer_string, string text)
{ {