fix: [EXILED::Events] Fixed the ChangingRoleAndSpawned.ChangeInventory NullReferenceException skill issue (#172)

FoxWorn3365 · iamalexrouse · louis1706 · web-flow · commit 5b246a2d93a3 · 2024-12-26T21:12:31.000+01:00
* loader updoot & removed unused using * Update EXILED/Exiled.Loader/Loader.cs Suggestion #1 Co-authored-by: Alex Rouse <123724383+ALEXWARELLC@users.noreply.github.com> * Update EXILED/Exiled.Loader/Loader.cs Co-authored-by: Alex Rouse <123724383+ALEXWARELLC@users.noreply.github.com> * moved method private methods should be defined after public ones * updoot exiled kill sissues Co-authored-by: Alex Rouse <123724383+ALEXWARELLC@users.noreply.github.com> * updoot exiled kill sissues Co-authored-by: Alex Rouse <123724383+ALEXWARELLC@users.noreply.github.com> * updoot exiled kill sissues Co-authored-by: Alex Rouse <123724383+ALEXWARELLC@users.noreply.github.com> * updoot * fixed the infamous error * rollback - not same pr * big update!!!!! --------- Co-authored-by: Alex Rouse <123724383+ALEXWARELLC@users.noreply.github.com> Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com>
diff --git a/EXILED/Exiled.Events/Patches/Events/Player/ChangingRoleAndSpawned.cs b/EXILED/Exiled.Events/Patches/Events/Player/ChangingRoleAndSpawned.cs
@@ -186,7 +186,10 @@ private static void ChangeInventory(ChangingRoleEventArgs ev)
         {
             try
             {
-                if (!NetworkServer.active || ev == null || !ev.SpawnFlags.HasFlag(RoleSpawnFlags.AssignInventory))
+                if (ev is null)
+                    return;
+
+                if (ev.ShouldPreserveInventory || ev.Reason == API.Enums.SpawnReason.Destroyed)
                     return;
 
                 Inventory inventory = ev.Player.Inventory;
diff --git a/EXILED/Exiled.Loader/Loader.cs b/EXILED/Exiled.Loader/Loader.cs
@@ -662,4 +662,4 @@ private static void LoadDependencies()
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,10 @@ private static void ChangeInventory(ChangingRoleEventArgs ev)`
`186`	`186`	`{`
`187`	`187`	`try`
`188`	`188`	`{`
`189`		`- if (!NetworkServer.active \|\| ev == null \|\| !ev.SpawnFlags.HasFlag(RoleSpawnFlags.AssignInventory))`
	`189`	`+ if (ev is null)`
	`190`	`+ return;`
	`191`	`+`
	`192`	`+ if (ev.ShouldPreserveInventory \|\| ev.Reason == API.Enums.SpawnReason.Destroyed)`
`190`	`193`	`return;`
`191`	`194`
`192`	`195`	`Inventory inventory = ev.Player.Inventory;`
Original file line number	Diff line number	Diff line change
`@@ -662,4 +662,4 @@ private static void LoadDependencies()`
`662`	`662`	`}`
`663`	`663`	`}`
`664`	`664`	`}`
`665`		`-}`
	`665`	`+}`