diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-08-14 03:50:59 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-08-14 03:50:59 +0100 |
| commit | 8cdba03c0a5eefbd6083ff609865b8be7cccc650 (patch) | |
| tree | c1dc9e92da67f427ce2451e24f71f545222d3f4a /src/main/java/gregtech/api/objects | |
| parent | 349510f2dabc9e7dc9ae5ff1fdc71fef11dd8016 (diff) | |
| download | GT5-Unofficial-8cdba03c0a5eefbd6083ff609865b8be7cccc650.tar.gz GT5-Unofficial-8cdba03c0a5eefbd6083ff609865b8be7cccc650.tar.bz2 GT5-Unofficial-8cdba03c0a5eefbd6083ff609865b8be7cccc650.zip | |
Bugfixes 2
Diffstat (limited to 'src/main/java/gregtech/api/objects')
| -rw-r--r-- | src/main/java/gregtech/api/objects/ElementStack.java | 6 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/objects/MaterialStack.java | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/objects/ElementStack.java b/src/main/java/gregtech/api/objects/ElementStack.java index f3e1543614..207d77f744 100644 --- a/src/main/java/gregtech/api/objects/ElementStack.java +++ b/src/main/java/gregtech/api/objects/ElementStack.java @@ -17,14 +17,16 @@ public class ElementStack implements Cloneable { @Override public ElementStack clone() { - return new ElementStack(mElement, mAmount); + try { Object cloneES = super.clone(); + //return new ElementStack(mElement, mAmount); + return (ElementStack) cloneES; } catch (Exception e) { return new ElementStack(mElement, mAmount); } } @Override public boolean equals(Object aObject) { if (aObject == this) return true; if (aObject == null) return false; - if (aObject instanceof Element) return aObject == mElement; + if (aObject instanceof Element) {return aObject == mElement;} if (aObject instanceof ElementStack) return ((ElementStack) aObject).mElement == mElement && (mAmount < 0 || ((ElementStack) aObject).mAmount < 0 || ((ElementStack) aObject).mAmount == mAmount); return false; diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java index 5ddb88423a..60808ab639 100644 --- a/src/main/java/gregtech/api/objects/MaterialStack.java +++ b/src/main/java/gregtech/api/objects/MaterialStack.java @@ -17,7 +17,9 @@ public class MaterialStack implements Cloneable { @Override public MaterialStack clone() { - return new MaterialStack(mMaterial, mAmount); + try { Object cloneMS = super.clone(); + //return new MaterialStack(mMaterial, mAmount); + return (MaterialStack) cloneMS;} catch (Exception e) { return new MaterialStack(mMaterial, mAmount); } } @Override |