From dc0dc9e406f6b140fb1162f8a2d9bab811bcd055 Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Tue, 16 Jul 2019 00:15:11 -0300
Subject: [PATCH] update for extensions

---
 gradle.properties                                |  2 +-
 .../java/carpet/settings/CarpetSettings.java     |  2 +-
 src/main/java/carpet/settings/Validator.java     | 16 ++--------------
 src/main/java/carpet/utils/Messenger.java        |  2 +-
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 889c767e..d5d3ea67 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.4.8+build.155
 
 # Mod Properties
-	mod_version = 1.0.0+v190707
+	mod_version = 1.0.0+v190714
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 
diff --git a/src/main/java/carpet/settings/CarpetSettings.java b/src/main/java/carpet/settings/CarpetSettings.java
index 89416edf..dec1e9e0 100644
--- a/src/main/java/carpet/settings/CarpetSettings.java
+++ b/src/main/java/carpet/settings/CarpetSettings.java
@@ -26,7 +26,7 @@ import static carpet.settings.RuleCategory.SURVIVAL;
 
 public class CarpetSettings
 {
-    public static final String carpetVersion = "v190707";
+    public static final String carpetVersion = "v190714";
     public static final Logger LOG = LogManager.getLogger();
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;
diff --git a/src/main/java/carpet/settings/Validator.java b/src/main/java/carpet/settings/Validator.java
index 706147d7..723d6308 100644
--- a/src/main/java/carpet/settings/Validator.java
+++ b/src/main/java/carpet/settings/Validator.java
@@ -44,12 +44,7 @@ public abstract class Validator<T>
         @Override
         public T validate(ServerCommandSource source, ParsedRule<T> currentRule, T newValue, String string)
         {
-            if (source != null)
-                try
-                {
-                    Messenger.m(source, "r "+currentRule.name+" is missing a few bits - we are still working on it.");
-                }
-                catch (NullPointerException ignored) { }
+            Messenger.m(source, "r "+currentRule.name+" is missing a few bits - we are still working on it.");
             return newValue;
         }
         @Override
@@ -62,14 +57,7 @@ public abstract class Validator<T>
         {
             if (!currentRule.options.contains(string.toLowerCase(Locale.ROOT)))
             {
-                if (source != null)
-                    try
-                    {
-                        Messenger.m(source, "r Valid options: " + currentRule.options.toString());
-                    }
-                    catch (NullPointerException ignored)
-                    {
-                    }
+                Messenger.m(source, "r Valid options: " + currentRule.options.toString());
                 return null;
             }
             return newValue;
diff --git a/src/main/java/carpet/utils/Messenger.java b/src/main/java/carpet/utils/Messenger.java
index 6cd7f914..68295a6e 100644
--- a/src/main/java/carpet/utils/Messenger.java
+++ b/src/main/java/carpet/utils/Messenger.java
@@ -220,7 +220,7 @@ public class Messenger
     //message source
     public static void m(ServerCommandSource source, Object ... fields)
     {
-        source.sendFeedback(Messenger.c(fields),source.getMinecraftServer().getWorld(DimensionType.OVERWORLD).getGameRules() != null);
+        source.sendFeedback(Messenger.c(fields),source.getMinecraftServer().getWorld(DimensionType.OVERWORLD) != null);
     }
     public static void m(PlayerEntity player, Object ... fields)
     {