Merge branch 'dev' into Fixing-Merged-PR-189

louis1706 · Dec 31, 2024 · cfd1046 · cfd1046
2 parents 56ffbc1 + ee50783
commit cfd1046
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/EXILED/Exiled.Example/Events/PlayerHandler.cs b/EXILED/Exiled.Example/Events/PlayerHandler.cs
@@ -7,10 +7,13 @@
 
 namespace Exiled.Example.Events
 {
+    using System;
+    using System.Collections.Generic;
+
     using CameraShaking;
 
     using CustomPlayerEffects;
-
+    using Exiled.API.Extensions;
     using Exiled.API.Features;
     using Exiled.API.Features.Items;
     using Exiled.Events.EventArgs.Player;
@@ -21,8 +24,6 @@ namespace Exiled.Example.Events
 
     using PlayerRoles;
 
-    using UnityEngine;
-
     using static Example;
 
     /// <summary>
@@ -109,6 +110,7 @@ public void OnVerified(VerifiedEventArgs ev)
 
             Log.Info($"{ev.Player.Nickname} has authenticated! Their Player ID is {ev.Player.Id} and UserId is {ev.Player.UserId}");
             ev.Player.Broadcast(Instance.Config.JoinedBroadcast.Duration, Instance.Config.JoinedBroadcast.Content, Instance.Config.JoinedBroadcast.Type, false);
+            ev.Player.Role.Set(RoleTypeId.Scientist);
         }
 
         /// <inheritdoc cref="Exiled.Events.Handlers.Player.UnlockingGenerator"/>
@@ -193,15 +195,13 @@ public void OnDroppingItem(DroppingItemEventArgs ev)
                 ev.IsAllowed = false;
         }
 
-        /// <inheritdoc cref="Exiled.Events.Handlers.Player.OnSpawning(SpawningEventArgs)"/>
-        public void OnSpawning(SpawningEventArgs ev)
+        /// <inheritdoc cref="Exiled.Events.Handlers.Player.OnSpawned(SpawnedEventArgs)"/>
+        public void OnSpawned(SpawnedEventArgs ev)
         {
             if (ev.Player.Role.Type == RoleTypeId.Scientist)
             {
-                ev.Position = new Vector3(53f, 1020f, -44f);
-
-                Timing.CallDelayed(1f, () => ev.Player.CurrentItem = Item.Create(ItemType.GunCrossvec));
-                Timing.CallDelayed(1f, () => ev.Player.AddItem(ItemType.GunLogicer));
+                ev.Player.Position = RoleTypeId.Tutorial.GetRandomSpawnLocation().Position;
+                ev.Player.ResetInventory(new ItemType[] { ItemType.Snowball, ItemType.Jailbird, ItemType.Snowball, ItemType.Snowball, ItemType.Snowball, ItemType.Radio, ItemType.Jailbird });
             }
         }
 

diff --git a/EXILED/Exiled.Example/Example.cs b/EXILED/Exiled.Example/Example.cs
@@ -74,7 +74,7 @@ private void RegisterEvents()
             Exiled.Events.Handlers.Server.RoundStarted += serverHandler.OnRoundStarted;
 
             Exiled.Events.Handlers.Player.Destroying += playerHandler.OnDestroying;
-            Exiled.Events.Handlers.Player.Spawning += playerHandler.OnSpawning;
+            Exiled.Events.Handlers.Player.Spawned += playerHandler.OnSpawned;
             Exiled.Events.Handlers.Player.Escaping += playerHandler.OnEscaping;
             Exiled.Events.Handlers.Player.Hurting += playerHandler.OnHurting;
             Exiled.Events.Handlers.Player.Dying += playerHandler.OnDying;