From 67df350a04bc6f039f2de1853da608ee34e2c1cb Mon Sep 17 00:00:00 2001 From: zontreck Date: Fri, 7 Mar 2025 01:26:45 -0700 Subject: [PATCH] For failed RTP, cooldown is half the cooldown time. --- AriasServerUtils/EventHandler.cs | 9 +++++++-- AriasServerUtils/modinfo.json | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/AriasServerUtils/EventHandler.cs b/AriasServerUtils/EventHandler.cs index 740276f..134c08d 100644 --- a/AriasServerUtils/EventHandler.cs +++ b/AriasServerUtils/EventHandler.cs @@ -74,12 +74,13 @@ namespace AriasServerUtils ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:rtp-search")); - ps.ActiveCooldowns.Add(CooldownType.RTP, TimeUtil.DecodeTimeNotation(ServerUtilities.config.Cooldowns.Get(CooldownType.RTP)) + TimeUtil.GetUnixEpochTimestamp()); - ServerUtilities.MarkDirty(); PlayerPosition pPos = RTPFactory.GetRandomPosition(isp, maxDistance: maxDistance); if (pPos == null) { + ps.ActiveCooldowns.Add(CooldownType.RTP, (TimeUtil.DecodeTimeNotation(ServerUtilities.config.Cooldowns.Get(CooldownType.RTP)) / 2) + TimeUtil.GetUnixEpochTimestamp()); + ServerUtilities.MarkDirty(); + ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:rtp-fail")); return TextCommandResult.Success(); } @@ -90,6 +91,10 @@ namespace AriasServerUtils pPos.Merge(isp.Entity); + + ps.ActiveCooldowns.Add(CooldownType.RTP, TimeUtil.DecodeTimeNotation(ServerUtilities.config.Cooldowns.Get(CooldownType.RTP)) + TimeUtil.GetUnixEpochTimestamp()); + ServerUtilities.MarkDirty(); + ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:rtp", distance)); } diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index b0c8d9b..870a2ef 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 03-07-2025 @ 1:21 AM MST", - "version": "1.0.5-dev.4", + "description": "A collection of server utilities\n\nBuild Date: 03-07-2025 @ 1:26 AM MST", + "version": "1.0.5-dev.5", "dependencies": { "game": "" }