Skip to content

Commit

Permalink
These placeholders require a player. Fixes #7
Browse files Browse the repository at this point in the history
  • Loading branch information
markhughes committed May 21, 2017
1 parent 570dcc9 commit d76d89a
Showing 1 changed file with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ public String get(Player player) {
this.placeholders.add(new FactionsPlaceholder("location_relation") {
@Override
public String get(Player player) {
if (player == null) return null;
FPlayer fplayer = FPlayerColl.get(player);
Faction faction = Board.get().getFactionAt(fplayer.getLastStoodAt());

Expand All @@ -186,6 +187,7 @@ public String get(Player player) {
this.placeholders.add(new FactionsPlaceholder("location_faction_name") {
@Override
public String get(Player player) {
if (player == null) return null;
FPlayer fplayer = FPlayerColl.get(player);
Faction faction = Board.get().getFactionAt(fplayer.getLastStoodAt());

Expand All @@ -196,6 +198,7 @@ public String get(Player player) {
this.placeholders.add(new FactionsPlaceholder("location_faction_description") {
@Override
public String get(Player player) {
if (player == null) return null;
FPlayer fplayer = FPlayerColl.get(player);
Faction faction = Board.get().getFactionAt(fplayer.getLastStoodAt());

Expand All @@ -206,6 +209,7 @@ public String get(Player player) {
this.placeholders.add(new FactionsPlaceholder("location_faction_founded") {
@Override
public String get(Player player) {
if (player == null) return null;
FPlayer fplayer = FPlayerColl.get(player);
Faction faction = Board.get().getFactionAt(fplayer.getLastStoodAt());

Expand Down

0 comments on commit d76d89a

Please sign in to comment.