From aecc7ee66fa6659b056b9435ff76eee7b98ea2c1 Mon Sep 17 00:00:00 2001
From: zznty <94796179+zznty@users.noreply.github.com>
Date: Sun, 12 Nov 2023 14:51:56 +0700
Subject: [PATCH] fix warnings

---
 LuckPerms.Torch/Extensions/IteratorExtensions.cs | 14 +++++---------
 LuckPerms.Torch/Impl/LpCommandManager.cs         |  3 +--
 LuckPerms.Torch/LuckPerms.Torch.csproj           |  1 +
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/LuckPerms.Torch/Extensions/IteratorExtensions.cs b/LuckPerms.Torch/Extensions/IteratorExtensions.cs
index 6eac4cd..115a488 100644
--- a/LuckPerms.Torch/Extensions/IteratorExtensions.cs
+++ b/LuckPerms.Torch/Extensions/IteratorExtensions.cs
@@ -15,14 +15,10 @@ public static class IteratorExtensions
     {
         public bool MoveNext()
         {
-            if (iterator.hasNext())
-            {
-                Current = iterator.next() is T ? (T)iterator.next() : default;
-                return true;
-            }
-
-            Current = default;
-            return false;
+            if (!iterator.hasNext()) return false;
+            
+            Current = (T)iterator.next();
+            return true;
         }
 
         public void Reset()
@@ -32,7 +28,7 @@ public static class IteratorExtensions
 
         object? IEnumerator.Current => Current;
 
-        public T? Current { get; private set; }
+        public T Current { get; private set; }
 
         public void Dispose()
         {
diff --git a/LuckPerms.Torch/Impl/LpCommandManager.cs b/LuckPerms.Torch/Impl/LpCommandManager.cs
index 483a188..ec67006 100644
--- a/LuckPerms.Torch/Impl/LpCommandManager.cs
+++ b/LuckPerms.Torch/Impl/LpCommandManager.cs
@@ -1,6 +1,5 @@
 using me.lucko.luckperms.common.command.utils;
 using me.lucko.luckperms.common.plugin;
-using me.lucko.luckperms.common.sender;
 using Torch.API.Managers;
 using Torch.Commands;
 using Torch.Managers;
@@ -24,7 +23,7 @@ public class LpCommandManager(LuckPermsPlugin plugin, LpSenderFactory senderFact
         foreach (var alias in Aliases)
         {
             _commandManager.Commands.AddCommand(new(alias, "LuckPerms commands", (ctx, _) => Execute(alias, ctx),
-                ((LpTorchBootstrap)plugin.getBootstrap()).GetTorchPlugin(), MyPromoteLevel.None));
+                ((LpTorchBootstrap)getPlugin().getBootstrap()).GetTorchPlugin(), MyPromoteLevel.None));
         }
     }
 
diff --git a/LuckPerms.Torch/LuckPerms.Torch.csproj b/LuckPerms.Torch/LuckPerms.Torch.csproj
index ba5778f..14d2ba1 100644
--- a/LuckPerms.Torch/LuckPerms.Torch.csproj
+++ b/LuckPerms.Torch/LuckPerms.Torch.csproj
@@ -8,6 +8,7 @@
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
         <EnableWindowsTargeting>true</EnableWindowsTargeting>
         <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+        <NoWarn>CS9107</NoWarn>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">