diff options
author | okamosy <okamosy@gmail.com> | 2011-10-30 21:30:21 +0000 |
---|---|---|
committer | okamosy <okamosy@gmail.com> | 2011-10-30 21:30:21 +0000 |
commit | dd87dcdd3d3d94d00a38dbb37280fad183356601 (patch) | |
tree | 5eb10376287f9d3a4435e62168195598a42ccd8c /EssentialsUpdate/src/com/earth2me/essentials/update/Version.java | |
parent | ffd7ba7d5f2312ea9fc1c818b39938e5d7de86b6 (diff) | |
parent | 4ac03ef15a7c729a683bfd65b419d0d6ca65756c (diff) | |
download | Essentials-dd87dcdd3d3d94d00a38dbb37280fad183356601.tar Essentials-dd87dcdd3d3d94d00a38dbb37280fad183356601.tar.gz Essentials-dd87dcdd3d3d94d00a38dbb37280fad183356601.tar.lz Essentials-dd87dcdd3d3d94d00a38dbb37280fad183356601.tar.xz Essentials-dd87dcdd3d3d94d00a38dbb37280fad183356601.zip |
Merge branch 'master' of github.com:essentials/Essentials into ess
Diffstat (limited to 'EssentialsUpdate/src/com/earth2me/essentials/update/Version.java')
-rw-r--r-- | EssentialsUpdate/src/com/earth2me/essentials/update/Version.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/Version.java b/EssentialsUpdate/src/com/earth2me/essentials/update/Version.java index 8e6cbc97f..a82f49abf 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/Version.java +++ b/EssentialsUpdate/src/com/earth2me/essentials/update/Version.java @@ -147,7 +147,7 @@ public class Version implements Comparable<Version> hash = 71 * hash + this.major; hash = 71 * hash + this.minor; hash = 71 * hash + this.build; - hash = 71 * hash + (this.type != null ? this.type.hashCode() : 0); + hash = 71 * hash + (this.type == null ? 0 : this.type.hashCode()); return hash; } |