Merge branch 'dev'

SmartlyDressedGames · Apr 9, 2021 · 3e8f5e4 · 3e8f5e4
2 parents c4fdf0c + baa9d92
commit 3e8f5e4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,12 @@
 
 All notable changes should be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## 4.9.3.11 - 2021-4-02
+## 4.9.3.12 - 2021-04-09
+
+### Changed
+- Replaced `UnturnedPlayer` usage of `PlayerSkills.askSkills`. Thanks @PandahutMiku: [#2537](https://github.com/SmartlyDressedGames/Unturned-3.x-Community/issues/2537)
+
+## 4.9.3.11 - 2021-04-02
 
 ### Changed
 - Replaced Assembly-CSharp-firstpass.dll with Steamworks.NET.dll.

diff --git a/Rocket.Unturned/Player/UnturnedPlayer.cs b/Rocket.Unturned/Player/UnturnedPlayer.cs
@@ -224,14 +224,7 @@ public string IP
 
         public void MaxSkills()
         {
-            PlayerSkills skills = player.skills;
-
-            foreach (var skill in skills.skills.SelectMany(s => s))
-            {
-                skill.level = skill.max;
-            }
-
-            skills.askSkills(player.channel.owner.playerID.steamID);
+            player.skills.ServerUnlockAllSkills();
         }
 
         public string SteamGroupName()
@@ -591,8 +584,7 @@ public bool IsInVehicle
 
         public void SetSkillLevel(UnturnedSkill skill, byte level)
         {
-            GetSkill(skill).level = level;
-            player.skills.askSkills(CSteamID);
+            player.skills.ServerSetSkillLevel(skill.Speciality, skill.Skill, level);
         }
 
         public byte GetSkillLevel(UnturnedSkill skill)

diff --git a/Rocket.Unturned/Properties/AssemblyInfo.cs b/Rocket.Unturned/Properties/AssemblyInfo.cs
@@ -6,4 +6,4 @@
 [assembly: AssemblyProduct("Rocket.Unturned")]
 [assembly: AssemblyCopyright("Copyright ©  2016")]
 [assembly: Guid("8870d132-f877-4fbd-9e73-49c8b1af8b3f")]
-[assembly: AssemblyVersion("4.9.3.11")]
+[assembly: AssemblyVersion("4.9.3.12")]
diff --git a/Rocket.Unturned/Rocket.Unturned/Rocket.Unturned.module b/Rocket.Unturned/Rocket.Unturned/Rocket.Unturned.module
@@ -1,6 +1,6 @@
 {
 	"Name": "Rocket.Unturned",
-	"Version": "4.9.3.11",
+	"Version": "4.9.3.12",
 	"Assemblies":
 	[
 		{