aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/objects
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2016-06-21 19:32:31 +0200
committerDream-Master <dream-master@gmx.net>2016-06-21 19:32:31 +0200
commitfafe1bcc8823158382ed9d45c1e1fc42e02fa9c5 (patch)
tree1768cb06f91170eeb7cfd76ca9904507b702d734 /src/main/java/gregtech/api/objects
parent4f1900142313bf92a82f48fc146bd8c806734d7a (diff)
downloadGT5-Unofficial-fafe1bcc8823158382ed9d45c1e1fc42e02fa9c5.tar.gz
GT5-Unofficial-fafe1bcc8823158382ed9d45c1e1fc42e02fa9c5.tar.bz2
GT5-Unofficial-fafe1bcc8823158382ed9d45c1e1fc42e02fa9c5.zip
reverse commit
Diffstat (limited to 'src/main/java/gregtech/api/objects')
-rw-r--r--src/main/java/gregtech/api/objects/GT_FluidStack.java4
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 3f9e52818c..d4afd2bd3a 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 volatile boolean lock = false;
+ private static 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 synchronized void fixAllThoseFuckingFluidIDs() {
+ public static void fixAllThoseFuckingFluidIDs() {
if (ForgeVersion.getBuildVersion() < 1355) {
while (lock) {
try {