Skip to content

Commit

Permalink
MatchObjective doesn't have a Name
Browse files Browse the repository at this point in the history
  • Loading branch information
Ross Day committed Dec 9, 2016
1 parent 2be6490 commit fc990e7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/GW2NET.Core/WorldVersusWorld/CompetitiveMap.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public abstract class CompetitiveMap

private static readonly MatchObjective[] EmptyObjectives = new MatchObjective[0];

private ICollection<MatchObjective> objectives;
private ICollection<MatchObjective> objectives = EmptyObjectives;

/// <summary>Gets or sets the map's bonuses.</summary>
public virtual ICollection<MapBonus> Bonuses
Expand Down
13 changes: 2 additions & 11 deletions src/GW2NET.Core/WorldVersusWorld/MatchObjective.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ public class MatchObjective : IEquatable<MatchObjective>
/// <summary>Gets or sets the locale.</summary>
public virtual CultureInfo Culture { get; set; }

/// <summary>Gets or sets the name of the objective. This is a navigation property. Use the value of <see cref="ObjectiveId"/> to obtain a reference.</summary>
public virtual ObjectiveName Name { get; set; }

/// <summary>Gets or sets the objective identifier.</summary>
public virtual string ObjectiveId { get; set; }

Expand All @@ -37,10 +34,10 @@ public class MatchObjective : IEquatable<MatchObjective>
/// <summary>Gets or sets the identifier of the guild currently claiming the objective.</summary>
public virtual Guid? OwnerGuildId { get; set; }

/// <summary>Gets of sets timestamp when objective was claimed by a guild.</summary>
/// <summary>Gets or sets timestamp when objective was claimed by a guild.</summary>
public virtual string ClaimedAt { get; set; }

/// <summary>Gets of sets timestamp of last flip of the objective.</summary>
/// <summary>Gets or sets timestamp of last flip of the objective.</summary>
public virtual string LastFlipped { get; set; }

/// <summary>Indicates whether an object is equal to another object of the same type.</summary>
Expand Down Expand Up @@ -113,12 +110,6 @@ public override int GetHashCode()
/// <returns>A string that represents the current object.</returns>
public override string ToString()
{
var name = this.Name;
if (name != null)
{
return name.ToString();
}

return this.ObjectiveId;
}
}
Expand Down

0 comments on commit fc990e7

Please sign in to comment.