From 17d8e2eda84935f73f4296d7c28f34c0c131d687 Mon Sep 17 00:00:00 2001
From: Jeremy Schroeder <jeremy@ssdbg.com>
Date: Tue, 6 Aug 2013 19:46:41 -0400
Subject: [PATCH] Formatting.

---
 .../net/aufdemrand/denizen/npc/traits/HealthTrait.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java
index 966e112c4d..4b17ddd12d 100644
--- a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java
+++ b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java
@@ -32,16 +32,17 @@
 public class HealthTrait extends Trait implements Listener {
 
     // Saved to the C2 saves.yml
-
     @Persist("animatedeath")
     private boolean animatedeath = Settings.HealthTraitAnimatedDeathEnabled();
 
     @Persist("respawnondeath")
     private boolean respawn = Settings.HealthTraitRespawnEnabled();
+
     @Persist("respawndelayinseconds")
-    private String respawnDelay = Settings.HealthTraitRespawnDelay();;
+    private String respawnDelay = Settings.HealthTraitRespawnDelay();
+
     @Persist("respawnlocation")
-    private String respawnLocation = "<npc.location>";
+    private String respawnLocation =  "<npc.flag[respawn_location] || <npc.location>>";
 
     // internal
     private dPlayer player = null;