Commit: c98f626ee6c0ff75fa6262c2e4f9de5ac299e5a1 - admintoolkit (git)

Administrator's Toolkit VS plugin

Commit MetaInfo

• Revisão: c98f626ee6c0ff75fa6262c2e4f9de5ac299e5a1 (tree)
• Hora: 2020-11-05 07:23:22
• Autor: melchior <melchior@user...>
• Commiter: melchior

Mensagem de Log

Attempt to change spawn points for First time joins

Mudança Sumário

• modified: AdminToolkit/Commands/VariableSpawnpoints.cs
• modified: AdminToolkit/readme.md

Diff

--- a/AdminToolkit/Commands/VariableSpawnpoints.cs
+++ b/AdminToolkit/Commands/VariableSpawnpoints.cs
@@ -47,19 +47,20 @@ namespace AdminToolkit
 		public VariableSpawnpoints(ICoreServerAPI _serverAPI) : base(_serverAPI)
 		{				
 		this.Command = "spawnpoints";
-		this.Description = "Control add/remove/adjust List of approved player spawn points";
+		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.handler += HandleCommand;
 
 		ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.RunGame, ReloadSpawnpoints);
-		ServerAPI.Event.PlayerJoin += PlayerJoins;
+		
 		ServerAPI.Event.PlayerDeath += PlayerDied;
+		ServerAPI.Event.PlayerCreate += (byPlayer) => ChangeDefaultRoleSpawnPoint();
+		
+
 		ServerAPI.Event.ServerRunPhase(EnumServerRunPhase.Shutdown, PersistSpawnpoints);
 		}
 
-
-
 		private void HandleCommand(IServerPlayer player, int groupId, CmdArgs args)
 		{
 		string name;
@@ -114,9 +115,12 @@ namespace AdminToolkit
 			name = args.PopWord("?");
 			#if DEBUG
 			ResetPlayer(name);
-			player.SendMessage(groupId, $"Reset Playerdata for '{name}'", EnumChatType.CommandSuccess);
+			player.SendMessage(groupId, $"Reset State / Playerdata for '{name}'", EnumChatType.CommandSuccess);
 			#endif
 			}
+			else {
+			player.SendMessage(groupId, "Only CONSOLE may use command!", EnumChatType.CommandError);
+			}
 			break;
 
 		default:
@@ -186,11 +190,16 @@ namespace AdminToolkit
 		if (byPlayer != null && this.Spawnpoints != null && this.Spawnpoints.Count > 0) 
 			{
 			byPlayer.ClearSpawnPosition( );
-			//var datas = ServerAPI.PlayerData.GetPlayerDataByUid(byPlayer.PlayerUID);
-			//datas.	                 
-			//ServerAPI.Server.Players.Remove(byPlayer); //List is a array copy
+
+			var serverMain = ServerAPI.World as ServerMain;
 			var servPlayer = byPlayer as ServerPlayer;
+			var pdm = ServerAPI.PlayerData as PlayerDataManager;
+			var swpd = servPlayer.WorldData as ServerWorldPlayerData;
+			//swpd.Init(serverMain);
+			pdm.PlayerDataByUid.Remove(byPlayer.PlayerUID);
+			pdm.WorldDataByUID.Remove(byPlayer.PlayerUID);
 
+			//pdm.GetOrCreateServerPlayerData(byPlayer.PlayerUID);
 			}
 		}
 
@@ -214,7 +223,7 @@ namespace AdminToolkit
 		Logger.Notification("Created (empty) Spawnpoints Data");
 		}
 
-
+		ChangeDefaultRoleSpawnPoint( );
 		}
 
 		private void PersistSpawnpoints( )
@@ -227,12 +236,12 @@ namespace AdminToolkit
 
 		}
 
-		private void PlayerJoins( IServerPlayer byPlayer)
+		private void RotateSpawnPoint( IServerPlayer byPlayer)
 		{			
 		if (this.CachedConfiguration.VariableSpawnpoints && this.Spawnpoints.Count > 0) {
 				
-		var swpd = byPlayer.WorldData as ServerWorldPlayerData;
-		if (swpd.SpawnPosition == null || KnownSpawn(swpd.SpawnPosition)) 
+			var swpd = byPlayer.WorldData as ServerWorldPlayerData;
+			if (swpd != null && (swpd.SpawnPosition == null || KnownSpawn(swpd.SpawnPosition))) 
 			{
 			RandomizeSpawnpoint(byPlayer);
 			}
@@ -243,27 +252,43 @@ namespace AdminToolkit
 		{
 		if (this.CachedConfiguration.VariableSpawnpoints && this.Spawnpoints.Count > 0) {
 
-		var swpd = byPlayer.WorldData as ServerWorldPlayerData;
-		if (swpd.SpawnPosition == null || KnownSpawn(swpd.SpawnPosition)) 
-			{
+			var swpd = byPlayer.WorldData as ServerWorldPlayerData;
+			if (swpd != null && (swpd.SpawnPosition == null || KnownSpawn(swpd.SpawnPosition))) {
 			RandomizeSpawnpoint(byPlayer);
 			}
 		}
 		}
 
+		private void ChangeDefaultRoleSpawnPoint( )
+		{
+		if (this.CachedConfiguration.VariableSpawnpoints && this.Spawnpoints.Count > 0) {
+
+		var randSp = this.Spawnpoints[random.Next(0, Spawnpoints.Count)];
+
+		string roleCode = ServerAPI.Server.Config.DefaultRoleCode;
+		var serverPlayerRole = ServerAPI.Server.Config.Roles.Single(pr => pr.Code == roleCode) as PlayerRole;
+
+		#if DEBUG
+		Logger.VerboseDebug($"Changing ({serverPlayerRole.Name}) to spawn '{randSp.Name}' @ {randSp.Location}");
+		#endif
+		serverPlayerRole.DefaultSpawn = randSp.Location;		
+		}
+
+		}
+
 		#endregion
 
 
-		private void RandomizeSpawnpoint(IServerPlayer byPlayer)
+		internal void RandomizeSpawnpoint(IServerPlayer byPlayer)
 		{
-		var randSp = this.Spawnpoints[random.Next(0, Spawnpoints.Count - 1)];
+		var randSp = this.Spawnpoints[random.Next(0, Spawnpoints.Count)];
 		byPlayer.SetSpawnPosition(randSp.Location);
 		#if DEBUG
 		Logger.VerboseDebug($"Changed spawn Pos: '{randSp.Name}' @ {randSp.Location} for {byPlayer.PlayerName}");
 		#endif
 		}
 
-		private bool KnownSpawn(PlayerSpawnPos aSpawn)
+		internal bool KnownSpawn(PlayerSpawnPos aSpawn)
 		{
 		if (this.Spawnpoints.Count > 0) {
 		return this.Spawnpoints.Any(vsps => vsps.Location.x == aSpawn.x 
@@ -274,7 +299,7 @@ namespace AdminToolkit
 		return false;
 		}
 
-		private Vec3i RelativeToAbsolute(Vec3i location)
+		internal Vec3i RelativeToAbsolute(Vec3i location)
 		{
 		var start = ServerAPI.World.DefaultSpawnPosition.AsBlockPos;
 		return new Vec3i( location.X + start.X, location.Y, location.Z + start.Z);
@@ -286,7 +311,7 @@ namespace AdminToolkit
 		return new Vec3i(start.X - location.X, location.Y, start.Z - location.Z);
 		}
 
-		private string PrettyFormat(PlayerSpawnPos spawnPos)
+		internal string PrettyFormat(PlayerSpawnPos spawnPos)
 		{
 		var start = ServerAPI.World.DefaultSpawnPosition.AsBlockPos;
 

--- a/AdminToolkit/readme.md
+++ b/AdminToolkit/readme.md
@@ -106,7 +106,7 @@ edit file ('/ModConfig/admintoolkit.json' ) :
 
 
 
-VAIRABLE SPAWNS
+VARIABLE SPAWNS
 ---------------
 
 Lets admins define and have players spawn from a list of pre-defined coordinates.