diff options
| author | Muramasa- <haydenkilloh@gmail.com> | 2016-09-20 17:03:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-20 17:03:18 +0100 |
| commit | 8f2e13681b91a6e531ee9c199cbf78be077e6381 (patch) | |
| tree | e59861327c07b8a4f63632d0c57afc4b4f274d6c /src/main/java/gregtech/api/objects/ElementStack.java | |
| parent | a03fc7fc1dcc57168e567fbdd09afdd895ce2570 (diff) | |
| parent | 312141cd1096a19d07aa0a5186cd3e7eeee51a9d (diff) | |
| download | GT5-Unofficial-8f2e13681b91a6e531ee9c199cbf78be077e6381.tar.gz GT5-Unofficial-8f2e13681b91a6e531ee9c199cbf78be077e6381.tar.bz2 GT5-Unofficial-8f2e13681b91a6e531ee9c199cbf78be077e6381.zip | |
Merge pull request #632 from Muramasa-/Bugfixes
Various Bugfixes
Diffstat (limited to 'src/main/java/gregtech/api/objects/ElementStack.java')
| -rw-r--r-- | src/main/java/gregtech/api/objects/ElementStack.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/objects/ElementStack.java b/src/main/java/gregtech/api/objects/ElementStack.java index f3e1543614..773700f057 100644 --- a/src/main/java/gregtech/api/objects/ElementStack.java +++ b/src/main/java/gregtech/api/objects/ElementStack.java @@ -17,14 +17,14 @@ public class ElementStack implements Cloneable { @Override public ElementStack clone() { - return new ElementStack(mElement, mAmount); + try { return (ElementStack) super.clone(); } 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; |