From adfa6c92c01d4f1f0759af774219527e03f92bb6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 5 Jul 2017 20:14:02 -0500 Subject: [PATCH] Cleanup some volatiles --- .../core/handler/ContributorFancinessHandler.java | 9 ++++----- .../botania/common/core/version/VersionChecker.java | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 01ef03c30..0a60a9fe3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -38,8 +38,8 @@ import java.util.Properties; public final class ContributorFancinessHandler implements LayerRenderer { - public volatile static Map flowerMap = null; - private volatile static boolean startedLoading = false; + public static final Map flowerMap = new HashMap<>(); + private static boolean startedLoading = false; @Override public void doRenderLayer(@Nonnull EntityPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { @@ -60,7 +60,7 @@ public final class ContributorFancinessHandler implements LayerRenderer(); + flowerMap.clear(); for(String key : props.stringPropertyNames()) { String value = props.getProperty(key); @@ -146,7 +146,6 @@ public final class ContributorFancinessHandler implements LayerRenderer