From 4af43eb84c4e1ca529afd28b24d5306336ecde91 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 2 Apr 2019 15:43:40 -0400
Subject: [PATCH] WeatherTypes now matches upstream

---
 .../worldedit/world/weather/WeatherTypes.java | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/weather/WeatherTypes.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/weather/WeatherTypes.java
index 1aa1c9f12..7d8cfc4b3 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/weather/WeatherTypes.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/weather/WeatherTypes.java
@@ -23,20 +23,20 @@ import javax.annotation.Nullable;
 
 public class WeatherTypes {
 
-    public static final WeatherType CLEAR = register("clear");
-    public static final WeatherType RAIN = register("rain");
-    public static final WeatherType THUNDER_STORM = register("thunder_storm");
+    static {
+        // This isn't really a proper registry - so inject these before they're obtained.
+        WeatherType.REGISTRY.register("clear", new WeatherType("clear"));
+        WeatherType.REGISTRY.register("rain", new WeatherType("rain"));
+        WeatherType.REGISTRY.register("thunder_storm", new WeatherType("thunder_storm"));
+    }
+
+    @Nullable public static final WeatherType CLEAR = get("clear");
+    @Nullable public static final WeatherType RAIN = get("rain");
+    @Nullable public static final WeatherType THUNDER_STORM = get("thunder_storm");
 
     private WeatherTypes() {
     }
 
-    private static WeatherType register(final String id) {
-        return register(new WeatherType(id));
-    }
-
-    public static WeatherType register(final WeatherType weatherType) {
-        return WeatherType.REGISTRY.register(weatherType.getId(), weatherType);
-    }
 
     public static @Nullable WeatherType get(final String id) {
         return WeatherType.REGISTRY.get(id);