diff options
| author | Shawn Buckley <shawntbuckley@gmail.com> | 2015-10-21 20:47:13 -0400 |
|---|---|---|
| committer | Shawn Buckley <shawntbuckley@gmail.com> | 2015-10-21 20:47:13 -0400 |
| commit | bea4cfc54566b4f3b9971d1da93782b03410f669 (patch) | |
| tree | 0c736c222d38dcc1d016fd5318790c583e1bdf98 /src/main/java/gregtech/api/objects | |
| parent | 1185424fa7c692f9932623b965a99392d969e3c5 (diff) | |
| download | GT5-Unofficial-bea4cfc54566b4f3b9971d1da93782b03410f669.tar.gz GT5-Unofficial-bea4cfc54566b4f3b9971d1da93782b03410f669.tar.bz2 GT5-Unofficial-bea4cfc54566b4f3b9971d1da93782b03410f669.zip | |
Bring in experimental branch
Diffstat (limited to 'src/main/java/gregtech/api/objects')
| -rw-r--r-- | src/main/java/gregtech/api/objects/GT_FluidStack.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java index ac54003d35..11571ba816 100644 --- a/src/main/java/gregtech/api/objects/GT_FluidStack.java +++ b/src/main/java/gregtech/api/objects/GT_FluidStack.java @@ -18,7 +18,7 @@ import net.minecraftforge.fluids.FluidStack; public class GT_FluidStack extends FluidStack { private static final Collection<GT_FluidStack> sAllFluidStacks = new ArrayList<GT_FluidStack>(5000); private Fluid mFluid; - private static boolean lock=false; + private static volatile boolean lock=false; public GT_FluidStack(Fluid aFluid, int aAmount) { super(aFluid, aAmount); @@ -30,7 +30,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 {Thread.sleep(1);} catch (InterruptedException e) {}} lock=true; |