Commit: 90c4dfcea834bf8ea90aa29a11ef8a07771210b6 - admintoolkit (git)

Administrator's Toolkit VS plugin

Commit MetaInfo

• Revision: 90c4dfcea834bf8ea90aa29a11ef8a07771210b6 (tree)
• Time: 2021-01-12 11:36:10
• Author: melchior <melchior@user...>
• Commiter: melchior

Log Message

Bugfix for V.S.P. & invalid RoleCode

Change Summary

• modified: AdminToolkit/Commands/VariableSpawnpoints.cs

Incremental Difference

--- a/AdminToolkit/Commands/VariableSpawnpoints.cs
+++ b/AdminToolkit/Commands/VariableSpawnpoints.cs
@@ -49,13 +49,13 @@ namespace AdminToolkit
 		this.Command = "spawnpoints";
 		this.Description = "Control add / remove / adjust List of approved player spawn points";
 		this.RequiredPrivilege = Privilege.setspawn;
-		this.Syntax = @"Add {name} {123 456 -678}|here / Remove {name} / List / Enable / Disable";
+		this.Syntax = @"add {name} {123 456 -678}|here / remove {name} / list / enable / disable";
 		this.handler += HandleCommand;
 
 		ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.RunGame, ReloadSpawnpoints);
 		
 		ServerAPI.Event.PlayerDeath += PlayerDied;
-		ServerAPI.Event.PlayerCreate += (byPlayer) => ChangeDefaultRoleSpawnPoint();
+		ServerAPI.Event.PlayerCreate += PlayerCreated;
 		
 
 		ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.Shutdown, PersistSpawnpoints);
@@ -79,7 +79,12 @@ namespace AdminToolkit
 			position = player.Entity.Pos.XYZInt;
 			}
 			else {
-			var pos = args.PopVec3i(ServerAPI.World.DefaultSpawnPosition.AsBlockPos.ToVec3i( ));
+			var pos = args.PopVec3i(null);
+			if (pos == null) {
+			player.SendMessage(groupId, $"Can't add Spawnpoint '{name}' - Co-Ordinates Invalid!", EnumChatType.CommandError);
+			return;
+			}
+
 			position = RelativeToAbsolute(pos);
 			}
 
@@ -103,10 +108,12 @@ namespace AdminToolkit
 			break;
 
 		case "enable":
+			player.SendMessage(groupId, "OK.", EnumChatType.CommandSuccess);
 			Toggle(true);
 			break;
 			
 		case "disable":
+			player.SendMessage(groupId, "OK.", EnumChatType.CommandSuccess);
 			Toggle(false);
 			break;
 
@@ -139,14 +146,14 @@ namespace AdminToolkit
 		{
 		if (IsItSafe(position.AsBlockPos)) {
 		//Appears OK...
-		Logger.VerboseDebug($"Adding variable spawnpoint '{name}' @ {position}");
+		Logger.Event($"Adding variable spawnpoint '{name}' @ {position}");
 		var newSpawnpoint = new Spawnpoint(name, position);
 
 		this.Spawnpoints.Add(newSpawnpoint);
 		return true;
 		}
 		else {
-		Logger.VerboseDebug($"Apparently '{name}' spawnpoint is Unsafe!  @ABS:{position}");	
+		Logger.Notification($"Apparently '{name}' spawnpoint is Unsafe!  @ABS:{position}");	
 		}
 
 		return false;
@@ -186,6 +193,7 @@ namespace AdminToolkit
 
 		private void ListSpawnpoints( int chatGroupId, IServerPlayer player )
 		{
+			player.SendMessage(chatGroupId, $"V.S.P are {(this.CachedConfiguration.VariableSpawnpoints? "ENABLED":"DISABLED")}, with {this.Spawnpoints.Count} points.\n", EnumChatType.CommandSuccess);
 		if (this.Spawnpoints.Count > 0) {
 		foreach (var sp in this.Spawnpoints) {
 		player.SendMessage(chatGroupId, $"Spawn: '{sp.Name}' ({PrettyFormat(sp.Location)}) ABS:({sp.Location})", EnumChatType.CommandSuccess);
@@ -195,7 +203,18 @@ namespace AdminToolkit
 
 		private void Toggle(bool state)
 		{
-		this.CachedConfiguration.VariableSpawnpoints = state;
+		if (state == false && this.CachedConfiguration.VariableSpawnpoints ) {
+		ServerAPI.Event.PlayerDeath -= PlayerDied;
+		ServerAPI.Event.PlayerCreate -= PlayerCreated;
+		Logger.Notification("Variable Spawnpoints: DISABLED, events disconnected.");
+		this.CachedConfiguration.VariableSpawnpoints = false;
+		}
+		else if (state  && this.CachedConfiguration.VariableSpawnpoints == false) {
+		ServerAPI.Event.PlayerDeath += PlayerDied;
+		ServerAPI.Event.PlayerCreate += PlayerCreated;
+		Logger.Notification("Variable Spawnpoints: RE-ENABLED, events attached.");
+		this.CachedConfiguration.VariableSpawnpoints = true;
+		}
 		}
 
 		private void ResetPlayer(string name)
@@ -273,6 +292,13 @@ namespace AdminToolkit
 		}
 		}
 
+		private void PlayerCreated(IServerPlayer byPlayer)
+		{
+			ChangeDefaultRoleSpawnPoint( );
+		}
+
+
+
 		private void ChangeDefaultRoleSpawnPoint( )
 		{
 		if (this.CachedConfiguration.VariableSpawnpoints && this.Spawnpoints.Count > 0) {
@@ -280,7 +306,13 @@ namespace AdminToolkit
 		var randSp = this.Spawnpoints[random.Next(0, Spawnpoints.Count)];
 
 		string roleCode = CachedConfiguration.PlayerRoleNormal; //ServerAPI.Server.Config.DefaultRoleCode;
-		var serverPlayerRole = ServerAPI.Server.Config.Roles.Single(pr => pr.Code == roleCode) as PlayerRole;
+		var serverPlayerRole = ServerAPI.Server.Config.Roles.SingleOrDefault(pr => pr.Code == roleCode) as PlayerRole;
+		if (serverPlayerRole == null) {
+		Logger.Error("Missing RoleCode: {0} - Cannot use VSP! ", roleCode);
+		Toggle(false);
+		return;
+		}
+
 
 		#if DEBUG
 		Logger.VerboseDebug($"Changing ({serverPlayerRole.Name}) to spawn '{randSp.Name}' @ {randSp.Location}");
@@ -333,7 +365,7 @@ namespace AdminToolkit
         (
 		@"{0:D}, {1:D}, {2:D}",
     	spawnPos.x - start.X,
-        spawnPos.y - start.Y,
+        spawnPos.y,
         spawnPos.z - start.Z
 		);