Improved RunCommand and PlayerCheckReservedSlot event, bumped version (…

…#35)

NwPluginAPI/Core/Server.cs

@@ -248,7 +248,7 @@ public static void Shutdown(ushort redirectPort)
 		/// </summary>
 		/// <param name="command">The command name.</param>
 		/// <param name="sender">The <see cref="CommandSender"/> running the command.</param>
-		public static void RunCommand(string command, CommandSender sender = null) => GameCore.Console.singleton.TypeCommand(command, sender);
+		public static string RunCommand(string command, CommandSender sender = null) => ServerConsole.EnterCommand(command, sender);
 
 		/// <summary>
 		/// Shows a broadcast to the player.

NwPluginAPI/Core/Zones/Light/Rooms/LczScp914.cs

@@ -10,13 +10,13 @@ namespace PluginAPI.Core.Zones.Light.Rooms
 
 	public class LczScp914 : LczRoom
 	{
-		internal static LczScp914 Instance;
+		/*internal static LczScp914 Instance;
 
 		public static RoomLight RoomLights => Instance.Lights;
 
 		public static RoomIdentifier RoomIdentifier => Instance.Identifier;
 
-		public static PryableDoor Gate => null;
+		public static PryableDoor Gate => null;*/
 
 		/// <summary>
 		/// Gets the intake chamber <see cref="Transform"/>.

NwPluginAPI/Core/Zones/UnknownZone.cs

@@ -5,9 +5,9 @@ namespace PluginAPI.Core.Zones
 	/// </summary>
 	public class UnknownZone : FacilityZone
 	{
-		internal static UnknownZone Instance;
+		/*internal static UnknownZone Instance;
 
 		/// <inheritdoc/>
-		public override MapGeneration.FacilityZone ZoneType { get; } = MapGeneration.FacilityZone.Other;
+		public override MapGeneration.FacilityZone ZoneType { get; } = MapGeneration.FacilityZone.Other;*/
 	}
 }

NwPluginAPI/Events/IEventCancellation.cs

@@ -33,6 +33,7 @@ public interface IEventCancellation
 		/// </summary>
 		/// <param name="seconds">The delay in seconds.</param>
 		/// <param name="isForced">Indicates whether the player has to be rejected forcefully or not.</param>
+		/// <returns>Event cancellation data</returns>
 		public static PreauthCancellationData RejectDelay(byte seconds, bool isForced)
 		{
 			if (seconds < 1 || seconds > 25)
@@ -46,6 +47,7 @@ public static PreauthCancellationData RejectDelay(byte seconds, bool isForced)
 		/// </summary>
 		/// <param name="port">The new server port.</param>
 		/// <param name="isForced">Indicates whether the player has to be rejected forcefully or not.</param>
+		/// <returns>Event cancellation data</returns>
 		public static PreauthCancellationData RejectRedirect(ushort port, bool isForced) => new PreauthCancellationData(RejectionReason.Redirect, isForced, port: port);
 
 		/// <summary>
@@ -54,6 +56,7 @@ public static PreauthCancellationData RejectDelay(byte seconds, bool isForced)
 		/// <param name="banReason">The ban reason.</param>
 		/// <param name="expiration">The ban expiration time.</param>
 		/// <param name="isForced">Indicates whether the player has to be rejected forcefully or not.</param>
+		/// <returns>Event cancellation data</returns>
 		public static PreauthCancellationData RejectBanned(string banReason, DateTime expiration, bool isForced) =>
 			RejectBanned(banReason, expiration.Ticks, isForced);
 
@@ -63,6 +66,7 @@ public static PreauthCancellationData RejectBanned(string banReason, DateTime ex
 		/// <param name="banReason">The ban reason.</param>
 		/// <param name="expiration">The ban expiration time in .NET Ticks.</param>
 		/// <param name="isForced">Indicates whether the player has to be rejected forcefully or not.</param>
+		/// <returns>Event cancellation data</returns>
 		// ReSharper disable once MemberCanBePrivate.Global
 		public static PreauthCancellationData RejectBanned(string banReason, long expiration, bool isForced)
 		{
@@ -77,6 +81,7 @@ public static PreauthCancellationData RejectBanned(string banReason, long expira
 		/// </summary>
 		/// <param name="customReason">Custom rejection reason.</param>
 		/// <param name="isForced">Indicates whether the player has to be rejected forcefully or not.</param>
+		/// <returns>Event cancellation data</returns>
 		public static PreauthCancellationData Reject(string customReason, bool isForced)
 		{
 			if (string.IsNullOrEmpty(customReason) || customReason.Length > 400)
@@ -90,6 +95,7 @@ public static PreauthCancellationData Reject(string customReason, bool isForced)
 		/// </summary>
 		/// <param name="reason">Rejection reason.</param>
 		/// <param name="isForced">Indicates whether the player has to be rejected forcefully or not.</param>
+		/// <returns>Event cancellation data</returns>
 		public static PreauthCancellationData Reject(RejectionReason reason, bool isForced)
 		{
 			switch (reason)
@@ -110,11 +116,13 @@ public static PreauthCancellationData Reject(RejectionReason reason, bool isForc
 		/// </summary>
 		/// <param name="writer">The <see cref="NetDataWriter"/> instance.</param>
 		/// <param name="isForced">Indicates whether the player has to be rejected forcefully or not.</param>
+		/// <returns>Event cancellation data</returns>
 		public static PreauthCancellationData Reject(NetDataWriter writer, bool isForced) => new PreauthCancellationData(RejectionReason.NotSpecified, isForced, writer: writer);
 
 		/// <summary>
 		/// Accepts the connection.
 		/// </summary>
+		/// <returns>Event cancellation data</returns>
 		public static PreauthCancellationData Accept() =>
 			new PreauthCancellationData(RejectionReason.NotSpecified, false, isCancelled: false);
 
@@ -177,4 +185,36 @@ public NetDataWriter GenerateWriter(out bool forced)
 			return writer;
 		}
 	}
+
+	/// <summary>
+	/// Preauth Event Cancellation Data
+	/// </summary>
+	public readonly struct PlayerCheckReservedSlotCancellationData : IEventCancellation
+	{
+		public bool IsCancelled { get; }
+
+		// ReSharper disable once MemberCanBePrivate.Global
+		public readonly bool HasReservedSlot;
+
+		private PlayerCheckReservedSlotCancellationData(bool isCancelled, bool hasReservedSlot)
+		{
+			IsCancelled = isCancelled;
+			HasReservedSlot = hasReservedSlot;
+		}
+
+		/// <summary>
+		/// Doesn't override the reserved slot check.
+		/// </summary>
+		/// <returns>Event cancellation data</returns>
+		public static PlayerCheckReservedSlotCancellationData LeaveUnchanged() =>
+			new PlayerCheckReservedSlotCancellationData(false, false);
+
+		/// <summary>
+		/// Overrides reserved slot check.
+		/// </summary>
+		/// <param name="hasReservedSlot">Indicates whether the player has a reserved slot or not.</param>
+		/// <returns>Event cancellation data</returns>
+		public static PlayerCheckReservedSlotCancellationData Override(bool hasReservedSlot) =>
+			new PlayerCheckReservedSlotCancellationData(true, hasReservedSlot);
+	}
 }

NwPluginAPI/NwPluginAPI.csproj

@@ -30,7 +30,7 @@
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Title>Northwood.PluginAPI</Title>
 		<Copyright>Copyright by Hubert Moszka Northwood, 2022</Copyright>
-		<PackageVersion>12.0.0-beta6</PackageVersion>
+		<PackageVersion>12.0.0-beta7</PackageVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>

NwPluginAPI/PluginApiVersion.cs

@@ -3,7 +3,7 @@
 	internal static class PluginApiVersion
 	{
 		internal const string Version = "12.0.0"; //major.minor.patch ONLY
-		internal const string VersionString = "12.0.0-beta6";
+		internal const string VersionString = "12.0.0-beta7";
 
 		//PackageVersion needs to be set to the same value as VersionString MANUALLY IN .csproj
 	}