aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/api/objects/data
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-09-14 13:47:51 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-09-14 13:47:51 +1000
commit678a32be304bcffe457cf869ba6c5d57bdc1b2e1 (patch)
tree1db1454a7f2dcb3453370cea0ca995ec9188a9d2 /src/Java/gtPlusPlus/api/objects/data
parent84cce1bba9a1091f2428ebee464cbfdf57491def (diff)
downloadGT5-Unofficial-678a32be304bcffe457cf869ba6c5d57bdc1b2e1.tar.gz
GT5-Unofficial-678a32be304bcffe457cf869ba6c5d57bdc1b2e1.tar.bz2
GT5-Unofficial-678a32be304bcffe457cf869ba6c5d57bdc1b2e1.zip
$ Fixed the XP Convertor.
% Rewrote base tile entity system. % Added hashCode() to Pair.java. % Changed some calculations on Materials. % Made Rocket Engines produce heavy pollution.
Diffstat (limited to 'src/Java/gtPlusPlus/api/objects/data')
-rw-r--r--src/Java/gtPlusPlus/api/objects/data/Pair.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/api/objects/data/Pair.java b/src/Java/gtPlusPlus/api/objects/data/Pair.java
index 6ab781cf1e..e1d23e6b43 100644
--- a/src/Java/gtPlusPlus/api/objects/data/Pair.java
+++ b/src/Java/gtPlusPlus/api/objects/data/Pair.java
@@ -2,6 +2,8 @@ package gtPlusPlus.api.objects.data;
import java.io.Serializable;
+import com.google.common.base.Objects;
+
public class Pair<K,V> implements Serializable {
/**
@@ -24,4 +26,10 @@ public class Pair<K,V> implements Serializable {
return this.value;
}
+ @Override
+ public int hashCode() {
+ Integer aCode = Objects.hashCode(getKey(), getValue());
+ return aCode != null ? aCode : super.hashCode();
+ }
+
} \ No newline at end of file