Merge origin/master

This commit is contained in:
LevelX2 2018-01-27 11:43:01 +01:00
commit 020beb1bf6
9 changed files with 882 additions and 304 deletions

View file

@ -3773,4 +3773,22 @@ public abstract class PlayerImpl implements Player, Serializable {
public List<Designation> getDesignations() {
return designations;
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
PlayerImpl obj = (PlayerImpl) o;
if (this.getId() == null || obj.getId() == null) {
return false;
}
return this.getId().equals(obj.getId());
}
}