From a88d9c4e72adc5b5063398af39c5c80817623cb5 Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Tue, 21 Jun 2016 21:07:14 +0200
Subject: experimental branch

---
 src/main/java/gregtech/api/objects/GT_FluidStack.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gregtech/api/objects')

diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java
index d4afd2bd3a..3f9e52818c 100644
--- a/src/main/java/gregtech/api/objects/GT_FluidStack.java
+++ b/src/main/java/gregtech/api/objects/GT_FluidStack.java
@@ -16,7 +16,7 @@ import java.util.Map;
  */
 public class GT_FluidStack extends FluidStack {
     private static final Collection<GT_FluidStack> sAllFluidStacks = new ArrayList<GT_FluidStack>(5000);
-    private static boolean lock = false;
+    private static volatile boolean lock = false;
     private Fluid mFluid;
 
     public GT_FluidStack(Fluid aFluid, int aAmount) {
@@ -29,7 +29,7 @@ public class GT_FluidStack extends FluidStack {
         this(aFluid.getFluid(), aFluid.amount);
     }
 
-    public static void fixAllThoseFuckingFluidIDs() {
+    public static synchronized void fixAllThoseFuckingFluidIDs() {
         if (ForgeVersion.getBuildVersion() < 1355) {
             while (lock) {
                 try {
-- 
cgit