Remove WhereNot extension

uEssentials · Nov 13, 2016 · 15d11a2 · 15d11a2
1 parent 92ec44a
commit 15d11a2
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/src/Commands/CommandKillAnimals.cs b/src/Commands/CommandKillAnimals.cs
@@ -21,7 +21,7 @@
 */
 #endregion
 
-
+using System.Linq;
 using Essentials.Api.Command;
 using Essentials.Api.Command.Source;
 using Essentials.Api.Unturned;
@@ -42,7 +42,7 @@ public class CommandKillAnimals : EssCommand {
         public override CommandResult OnExecute(ICommandSource src, ICommandArgs args) {
             var killedCount = 0;
 
-            UWorld.Animals.WhereNot(animal => animal.isDead).ForEach(animal => {
+            UWorld.Animals.Where(animal => !animal.isDead).ForEach(animal => {
                 AnimalManager.sendAnimalDead(animal, Vector3.zero);
                 killedCount++;
             });

diff --git a/src/Commands/CommandKillZombies.cs b/src/Commands/CommandKillZombies.cs
@@ -21,7 +21,7 @@
 */
 #endregion
 
-
+using System.Linq;
 using Essentials.Api.Command;
 using Essentials.Api.Command.Source;
 using Essentials.Api.Unturned;
@@ -42,7 +42,7 @@ public class CommandKillZombies : EssCommand {
         public override CommandResult OnExecute(ICommandSource src, ICommandArgs args) {
             var killedCount = 0;
 
-            UWorld.Zombies.WhereNot(zombie => zombie.isDead).ForEach(zombie => {
+            UWorld.Zombies.Where(zombie => !zombie.isDead).ForEach(zombie => {
                 ZombieManager.sendZombieDead(zombie, Vector3.zero);
                 killedCount++;
             });

diff --git a/src/Commands/CommandRefuelVehicle.cs b/src/Commands/CommandRefuelVehicle.cs
@@ -21,6 +21,7 @@
 */
 #endregion
 
+using System.Linq;
 using Essentials.Api.Command;
 using Essentials.Api.Command.Source;
 using Essentials.Api.Unturned;
@@ -60,7 +61,7 @@ public class CommandRefuelVehicle : EssCommand {
 
                 lock (UWorld.Vehicles) {
                     UWorld.Vehicles
-                        .WhereNot(veh => veh.isExploded || veh.isUnderwater)
+                        .Where(veh => !veh.isExploded && !veh.isUnderwater)
                         .ForEach(RefuelVehicle);
 
                     EssLang.Send(src, "VEHICLE_REFUELED_ALL");

diff --git a/src/Commands/CommandRepairVehicle.cs b/src/Commands/CommandRepairVehicle.cs
@@ -61,7 +61,7 @@ public class CommandRepairVehicle : EssCommand {
 
                 lock (UWorld.Vehicles) {
                     UWorld.Vehicles
-                        .WhereNot(veh => veh.isExploded || veh.isUnderwater)
+                        .Where(veh => !veh.isExploded && !veh.isUnderwater)
                         .ToList()
                         .ForEach(vehicle => {
                             VehicleManager.sendVehicleHealth(vehicle, vehicle.asset.health);

diff --git a/src/Common/Extensions.cs b/src/Common/Extensions.cs
@@ -56,10 +56,6 @@ public static class EnumerableExtensions {
             }
         }
 
-        public static IEnumerable<T> WhereNot<T>(this IEnumerable<T> src, Func<T, bool> predicate) {
-            return src.Where(t => !predicate(t));
-        }
-
         public static bool None<T>(this IEnumerable<T> src, Func<T, bool> predicate) {
             return !src.Any(predicate);
         }

diff --git a/src/Core/EssCore.cs b/src/Core/EssCore.cs
@@ -199,7 +199,7 @@ public sealed class EssCore : RocketPlugin {
                 // Load native modules
                 Assembly.GetTypes()
                     .Where(t => typeof(NativeModule).IsAssignableFrom(t))
-                    .WhereNot(t => t.IsAbstract)
+                    .Where(t => !t.IsAbstract)
                     .Where(t => {
                         var moduleInfo = (ModuleInfo) t.GetCustomAttributes(typeof(ModuleInfo), false)[0];
                         return Config.EnabledSystems.Any(s => s.Equals(moduleInfo.Name, StringComparison.OrdinalIgnoreCase));