Commit: master - admintoolkit (git)

Administrator's Toolkit VS plugin

Commit MetaInfo

• Revision: 5d4bc37c03db327db9863ed14c4adec06d5cc76d (tree)
• Time: 2022-06-26 03:27:02
• Author: melchior <melchior@user...>
• Commiter: melchior

Log Message

0.3.9-rc Changes

Change Summary

• modified: AdminToolkit/AdminToolkit.csproj
• modified: AdminToolkit/Commands/IdlePlayerControl.cs
• modified: AdminToolkit/Commands/RulesCommand.cs
• delete: AdminToolkit/MultiLang.cs
• modified: AdminToolkit/modinfo.json

Incremental Difference

--- a/AdminToolkit/AdminToolkit.csproj
+++ b/AdminToolkit/AdminToolkit.csproj
@@ -102,7 +102,6 @@
     <None Include="assets\atk\lang\en.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="MultiLang.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

--- a/AdminToolkit/Commands/IdlePlayerControl.cs
+++ b/AdminToolkit/Commands/IdlePlayerControl.cs
@@ -26,7 +26,7 @@ namespace AdminToolkit
 		playerPositions = new Dictionary<string, EntityPos>(32);
 		this.Command = "idlekick";
 		this.Description = "Adjust Idle-ejector system settings.";
-		this.Syntax = @" set {time} | stats ";
+		this.Syntax = @" set {minutes} | stats ";
 		this.RequiredPrivilege = Privilege.kick;
 		this.handler += HandleIdlerCommand;
 		ServerAPI.Event.PlayerLeave += PlayerLeft;
@@ -46,36 +46,46 @@ namespace AdminToolkit
 			case @"set":
 				//Change default & next cycle check time
 				var timeMinutes = args.PopInt(0);
-				if (timeMinutes >= 5) {
+				if (timeMinutes > 0) {
 				TimeSpan newTimeout = new TimeSpan(0, timeMinutes.Value, 0);
 				this.CachedConfiguration.IdleTimeout = newTimeout;
 				player.SendMessage(groupId, $"Changed Idle timeout to: {newTimeout}", EnumChatType.CommandSuccess);
 				RestartTimers();
 				} else 
-					player.SendMessage(groupId, "no change; Value must be >= 5", EnumChatType.CommandError);
+				{
+				player.SendMessage(groupId, "Idle-check disabled.", EnumChatType.CommandError);
+				HaltIdleCheck( );
+				}
 			break;
 
 			case @"stats":
-			if (this.CachedConfiguration.IdleTimeout.TotalMinutes >= 5f) 
+			if (this.CachedConfiguration.IdleTimeout.TotalMinutes > 0f) 
 				{ player.SendMessage(groupId, $"Ejected: {kick_tally} player(s), Timeout = {this.CachedConfiguration.IdleTimeout}", EnumChatType.CommandSuccess); }
 				else { player.SendMessage(groupId, "offline.", EnumChatType.CommandSuccess);	}
 			break;
 
 			default:			
-				player.SendMessage(groupId, $"Unrecognised command: {command}", EnumChatType.CommandError);
+				player.SendMessage(groupId, $"Unrecognised command: '{command}'", EnumChatType.CommandError);
 			break;
 			}
 		}
 
+		private void HaltIdleCheck( )
+		{
+		if (timerIdent != 0L) {
+			ServerAPI.Event.UnregisterCallback(timerIdent);
+			playerPositions.Clear( );
+			}
+		}
+
 		private void RestartTimers( )
 		{			
 		if (timerIdent != 0L) 
 			{
 			ServerAPI.Event.UnregisterCallback(timerIdent);
-			playerPositions.Clear( );
-			FindIdlers(0f );
+			playerPositions.Clear( );			
 			}
-		timerIdent = ServerAPI.Event.RegisterCallback(FindIdlers, ( int )this.CachedConfiguration.IdleTimeout.TotalMilliseconds);
+		FindIdlers(0f);
 		}
 
 		private void FindIdlers(float delta )
@@ -85,10 +95,10 @@ namespace AdminToolkit
 		#endif
 
 		foreach (var srvPlayer in ServerAPI.Server.Players.Where(plr => plr.ConnectionState == EnumClientState.Playing)) {
-			if (srvPlayer?.WorldData?.CurrentGameMode != EnumGameMode.Spectator) {
+			if (srvPlayer?.WorldData?.CurrentGameMode == EnumGameMode.Survival) {
 				EntityPos oldPos;
 				if (playerPositions.TryGetValue(srvPlayer.PlayerUID, out oldPos)) {
-					if (oldPos.BasicallySameAsIgnoreAngles(srvPlayer.Entity.ServerPos, 0.001f)) {
+					if (oldPos.BasicallySameAsIgnoreAngles(srvPlayer.Entity.ServerPos, 0.01f)) {
 							if ( srvPlayer.Entity.CurrentControls.HasFlag( EnumEntityActivity.Idle) ||
 							    srvPlayer.Entity.CurrentControls.HasFlag(EnumEntityActivity.FloorSitting) ||
 							    srvPlayer.Entity.CurrentControls.HasFlag(EnumEntityActivity.Dead) ||
@@ -105,14 +115,17 @@ namespace AdminToolkit
 					}
 				}
 			}
+
+			timerIdent = ServerAPI.Event.RegisterCallback(FindIdlers, ( int )this.CachedConfiguration.IdleTimeout.TotalMilliseconds);
 		}
 
+
 		private void KickIdler(IServerPlayer them)
 		{
 		kick_tally++;
 		var message = MultiLang.Get(them.LanguageCode, idleKick_Key, them.PlayerName);
 		them.Disconnect(message);		 
-		ServerAPI.BroadcastMessageToAllGroups(message, EnumChatType.Notification);
+		//ServerAPI.BroadcastMessageToAllGroups(message, EnumChatType.Notification);
 		}
 
 		private void PlayerLeft(IServerPlayer byPlayer)

--- a/AdminToolkit/Commands/RulesCommand.cs
+++ b/AdminToolkit/Commands/RulesCommand.cs
@@ -153,7 +153,7 @@ namespace AdminToolkit
 			if (!AdminToolkit.AdminRoles.Contains(byPlayer.Role.Code)) {				
 				//For regular players
 				if (RulesCommand.CheckRuleAccepted(byPlayer) == false) {
-					//TODO: localize 
+					
 					byPlayer.SendMessage(GlobalConstants.CurrentChatGroup, MultiLang.GetUnformatted(byPlayer,"atk:type-rules"), EnumChatType.Notification);
 
 					if (this.CachedConfiguration.RuleRoleChangerEnabled) {

--- a/AdminToolkit/MultiLang.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-namespace AdminToolkit
-{
-	public class MultiLang
-	{
-		public MultiLang( )
-		{
-		}
-	}
-}
-

--- a/AdminToolkit/modinfo.json
+++ b/AdminToolkit/modinfo.json
@@ -4,7 +4,7 @@
   "ModID":"atk",
   "description" : "Provides Admin functions;\n admin listing, rules display (multi-lingual), auto-backup & more.",
   "authors": ["Melchior", ],
-  "version": "0.3.8",
+  "version": "0.3.9-rc.0",
   "dependencies": { 
 	"game": "1.16.0"	
   },