aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/objects
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2015-12-09 00:52:00 +0100
committerBlood-Asp <bloodasphendrik@gmail.com>2015-12-09 00:52:00 +0100
commitd415df7ea26c0424abf8df9797fb1c4467c62d12 (patch)
tree412dc40b356adf727637c7a9633fa039e7ae19f5 /src/main/java/gregtech/api/objects
parent46f4473de67d66676f3ecc36c6e441db3d1eebfe (diff)
downloadGT5-Unofficial-d415df7ea26c0424abf8df9797fb1c4467c62d12.tar.gz
GT5-Unofficial-d415df7ea26c0424abf8df9797fb1c4467c62d12.tar.bz2
GT5-Unofficial-d415df7ea26c0424abf8df9797fb1c4467c62d12.zip
merge of GT5.09 fixes into 5.08 branch
Diffstat (limited to 'src/main/java/gregtech/api/objects')
-rw-r--r--src/main/java/gregtech/api/objects/GT_FluidStack.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java
index 9b15009f57..d4afd2bd3a 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) {