From 66427b21785f387eedaa7f16f50bd8aea9ec3325 Mon Sep 17 00:00:00 2001
From: Blood-Asp <bloodasphendrik@gmail.com>
Date: Sun, 6 Dec 2015 18:37:10 +0100
Subject: [PATCH] fix fluidstack memory overflow

---
 src/main/java/gregtech/GT_Mod.java                    | 1 +
 src/main/java/gregtech/api/GregTech_API.java          | 1 +
 src/main/java/gregtech/api/objects/GT_FluidStack.java | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index eedcc37a..1730b5f1 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -819,6 +819,7 @@ public class GT_Mod
                 GT_OreDictUnificator.setStack(tOutput);
             }
         }
+        GregTech_API.mServerStarted = true;
         GT_Log.out.println("GT_Mod: ServerStarting-Phase finished!");
         GT_Log.ore.println("GT_Mod: ServerStarting-Phase finished!");
         for (Runnable tRunnable : GregTech_API.sAfterGTServerstart) {
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index 5c699cfd..03b717d7 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -187,6 +187,7 @@ public class GregTech_API {
     public static int mEUtoRF = 360;
     public static int mRFtoEU = 20;
     public static boolean mRFExplosions = true;
+    public static boolean mServerStarted = false;
     /**
      * Getting assigned by the Mod loading
      */
diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java
index d98981cc..3f9e5281 100644
--- a/src/main/java/gregtech/api/objects/GT_FluidStack.java
+++ b/src/main/java/gregtech/api/objects/GT_FluidStack.java
@@ -22,7 +22,7 @@ public class GT_FluidStack extends FluidStack {
     public GT_FluidStack(Fluid aFluid, int aAmount) {
         super(aFluid, aAmount);
         mFluid = aFluid;
-        sAllFluidStacks.add(this);
+        if(!GregTech_API.mServerStarted){sAllFluidStacks.add(this);}
     }
 
     public GT_FluidStack(FluidStack aFluid) {