aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-05-28 15:08:28 +0200
committerTechnus <daniel112092@gmail.com>2017-05-28 15:08:28 +0200
commit5b10ecbfb874826468b0e508834adf3c3c70a4cf (patch)
tree3b4b6833cc86c4c27252fc74e85002e2b3e324af /src/main
parent25ddda93b7ca436c6f7603c6ad29a238e7676ba9 (diff)
downloadGT5-Unofficial-5b10ecbfb874826468b0e508834adf3c3c70a4cf.tar.gz
GT5-Unofficial-5b10ecbfb874826468b0e508834adf3c3c70a4cf.tar.bz2
GT5-Unofficial-5b10ecbfb874826468b0e508834adf3c3c70a4cf.zip
Cleanup, minor change
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
index 64ebf27152..3c15107516 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
@@ -139,7 +139,7 @@ public final class dAtomDefinition extends cElementalDefinition {
}
private static boolean isStable(float lifeTime) {
- return lifeTime > 1.5e25f;
+ return lifeTime >= 1.5e25f;
}
private static int stableIzoCurve(int element) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
index 8873ebef00..fe25a100a2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
@@ -115,7 +115,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
float mass = from.getMass();
float euMult = mass / refMass;
eAmpereFlow = (int) Math.ceil(euMult);
- if (mass > refUnstableMass) {
+ if (mass > refUnstableMass || from.getDefinition().getRawLifeTime()<1.5e25f) {
mEUt = (int) -V[10];
} else {
mEUt = (int) -V[8];
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index 1e01dbdc4e..529064a22f 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -137,7 +137,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
float mass = into.getMass();
float euMult = mass / refMass;
eAmpereFlow = (int) Math.ceil(euMult);
- if (mass > refUnstableMass) {
+ if (mass > refUnstableMass || into.getDefinition().getRawLifeTime()<1.5e25f) {
mEUt = (int) -V[10];
} else {
mEUt = (int) -V[8];