Merge pull request #7 from caesarakalaeii/MrOkiDoki-main

update

.github/workflows/dotnet.yml

@@ -0,0 +1,26 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: .NET build
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 6.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore

.gitignore

@@ -168,8 +168,4 @@ tools/Cake.CoreCLR
 
 # .env file contains default environment variables for docker
 .env
-.git/
-
-#TODO Change config to configs in Admin and Streamer fetching
-#config files
-configs*
+.git/

BattleBitAPI/Common/Arguments/OnPlayerKillArguments.cs

@@ -1,16 +1,17 @@
 using System.Numerics;
 
-namespace BattleBitAPI.Common;
-
-public struct OnPlayerKillArguments<TPlayer> where TPlayer : Player<TPlayer>
+namespace BattleBitAPI.Common
 {
-    public TPlayer Killer;
-    public Vector3 KillerPosition;
+    public struct OnPlayerKillArguments<TPlayer> where TPlayer : Player<TPlayer>
+    {
+        public TPlayer Killer;
+        public Vector3 KillerPosition;
 
-    public TPlayer Victim;
-    public Vector3 VictimPosition;
+        public TPlayer Victim;
+        public Vector3 VictimPosition;
 
-    public string KillerTool;
-    public PlayerBody BodyPart;
-    public ReasonOfDamage SourceOfDamage;
-}
+        public string KillerTool;
+        public PlayerBody BodyPart;
+        public ReasonOfDamage SourceOfDamage;
+    }
+}

BattleBitAPI/Common/Conts.cs

@@ -1,47 +1,46 @@
-namespace BattleBitAPI.Server;
-
-public static class Const
+namespace CommunityServerAPI.BattleBitAPI
 {
-    // ---- Networking ---- 
-    /// <summary>
-    ///     Maximum data size for a single package. 4MB is default.
-    /// </summary>
-    public const int MaxNetworkPackageSize = 1024 * 1024 * 4; //4mb
-
-    /// <summary>
-    ///     How long should server/client wait until connection is determined as timed out when no packages is being sent for
-    ///     long time.
-    /// </summary>
-    public const int NetworkTimeout = 60 * 1000; //60 seconds
-
-    /// <summary>
-    ///     How frequently client/server will send keep alive to each other when no message is being sent to each other for a
-    ///     while.
-    /// </summary>
-    public const int NetworkKeepAlive = 5 * 1000; //15 seconds
-
-    /// <summary>
-    ///     How long server/client will wait other side to send their hail/initial package. In miliseconds.
-    /// </summary>
+    public static class Const
+    {
+        // ---- Networking ---- 
+        /// <summary>
+        /// Maximum data size for a single package. 4MB is default.
+        /// </summary>
+        public const int MaxNetworkPackageSize = 1024 * 1024 * 4;//4mb
+        /// <summary>
+        /// How long should server/client wait until connection is determined as timed out when no packages is being sent for long time.
+        /// </summary>
+        public const int NetworkTimeout = 60 * 1000;//60 seconds
+        /// <summary>
+        /// How frequently client/server will send keep alive to each other when no message is being sent to each other for a while.
+        /// </summary>
+        public const int NetworkKeepAlive = 5 * 1000;//15 seconds
+        /// <summary>
+        /// How long server/client will wait other side to send their hail/initial package. In miliseconds.
+        /// </summary>
 #if DEBUG
-    public const int HailConnectTimeout = 20 * 1000;
+        public const int HailConnectTimeout = 20 * 1000;
 #else
         public const int HailConnectTimeout = 2 * 1000;
 #endif
 
-    // ---- Server Fields ---- 
-    public const int MinServerNameLength = 5;
-    public const int MaxServerNameLength = 400;
+        // ---- Server Fields ---- 
+        public const int MinServerNameLength = 5;
+        public const int MaxServerNameLength = 400;
+
+        public const int MaxTokenSize = 512;
+
+        public const int MinGamemodeNameLength = 2;
+        public const int MaxGamemodeNameLength = 12;
 
-    public const int MinGamemodeNameLength = 2;
-    public const int MaxGamemodeNameLength = 12;
+        public const int MinMapNameLength = 2;
+        public const int MaxMapNameLength = 36;
 
-    public const int MinMapNameLength = 2;
-    public const int MaxMapNameLength = 36;
+        public const int MinLoadingScreenTextLength = 0;
+        public const int MaxLoadingScreenTextLength = 1024 * 8;
 
-    public const int MinLoadingScreenTextLength = 0;
-    public const int MaxLoadingScreenTextLength = 1024 * 8;
+        public const int MinServerRulesTextLength = 0;
+        public const int MaxServerRulesTextLength = 1024 * 8;
 
-    public const int MinServerRulesTextLength = 0;
-    public const int MaxServerRulesTextLength = 1024 * 8;
-}
+    }
+}

BattleBitAPI/Common/Data/PlayerLoadout.cs

@@ -282,7 +282,7 @@ public bool HasAttachment(Attachment attachment)
                 case AttachmentType.Barrel:
                     return this.Barrel == attachment;
                 case AttachmentType.UnderRail:
-                    return this.Barrel == attachment;
+                    return this.UnderRail == attachment;
                 case AttachmentType.SideRail:
                     return this.SideRail == attachment;
                 case AttachmentType.Bolt:
@@ -307,7 +307,7 @@ public void SetAttachment(Attachment attachment)
                     this.Barrel = attachment;
                     break;
                 case AttachmentType.UnderRail:
-                    this.Barrel = attachment;
+                    this.UnderRail = attachment;
                     break;
                 case AttachmentType.SideRail:
                     this.SideRail = attachment;

BattleBitAPI/Networking/NetworkCommuncation.cs

@@ -15,6 +15,7 @@ public enum NetworkCommuncation : byte
         SetNewRoundState = 15,
         SetPlayerWeapon = 16,
         SetPlayerGadget = 17,
+        SetPlayerModifications = 18,
 
         PlayerConnected = 50,
         PlayerDisconnected = 51,