diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-06-21 19:21:14 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-06-21 19:21:14 +0200 |
| commit | 4f1900142313bf92a82f48fc146bd8c806734d7a (patch) | |
| tree | 38387991fa4a64aecd8b97c3f4cf27a3c7f97653 /src/main/java/gregtech/api/objects | |
| parent | 6fe4d4a8d3226c02a65a70d7a8035a219cbd2c66 (diff) | |
| parent | 2651e69c7037e2f5e19b404158506941999cde08 (diff) | |
| download | GT5-Unofficial-4f1900142313bf92a82f48fc146bd8c806734d7a.tar.gz GT5-Unofficial-4f1900142313bf92a82f48fc146bd8c806734d7a.tar.bz2 GT5-Unofficial-4f1900142313bf92a82f48fc146bd8c806734d7a.zip | |
Merge branch 'experimental'
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 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 { |