From 69e9e9b0bb01d75654b808e2e3f8809b66e5d2fb Mon Sep 17 00:00:00 2001
From: altrisi <altrisi.trillosierra@gmail.com>
Date: Sat, 15 May 2021 23:53:50 +0200
Subject: [PATCH] Remove the number_classes set in favour of ClassUtils (#860)

---
 src/main/java/carpet/settings/ParsedRule.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/carpet/settings/ParsedRule.java b/src/main/java/carpet/settings/ParsedRule.java
index 2c802fae..ceec2686 100644
--- a/src/main/java/carpet/settings/ParsedRule.java
+++ b/src/main/java/carpet/settings/ParsedRule.java
@@ -3,7 +3,6 @@ package carpet.settings;
 import carpet.utils.Translations;
 import carpet.utils.Messenger;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Sets;
 import net.minecraft.server.command.ServerCommandSource;
 
 import java.lang.reflect.Constructor;
@@ -12,7 +11,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
+
+import org.apache.commons.lang3.ClassUtils;
 
 import static carpet.utils.Translations.tr;
 
@@ -39,7 +39,6 @@ public final class ParsedRule<T> implements Comparable<ParsedRule> {
     public final T defaultValue;
     public final String defaultAsString;
     public final SettingsManager settingsManager;
-    private static final Set<Class<?>> NUMBER_CLASSES = Sets.newHashSet(byte.class, short.class, int.class, long.class, float.class, double.class);
 
     ParsedRule(Field field, Rule rule, SettingsManager settingsManager)
     {
@@ -216,7 +215,7 @@ public final class ParsedRule<T> implements Comparable<ParsedRule> {
     public boolean getBoolValue()
     {
         if (type == boolean.class) return (Boolean) get();
-        if (NUMBER_CLASSES.contains(type)) return ((Number) get()).doubleValue() > 0;
+        if (ClassUtils.primitiveToWrapper(type).isAssignableFrom(Number.class)) return ((Number) get()).doubleValue() > 0;
         return false;
     }