From bd5b2251bb6093f18b5c681af34935f3715220e9 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Thu, 6 Nov 2014 23:07:04 +0800
Subject: [PATCH] Minor cleanup

---
 src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java | 9 ++++-----
 src/main/java/net/citizensnpcs/api/util/NBTStorage.java | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java b/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java
index 9a724fe0..04d2b79e 100644
--- a/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java
+++ b/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java
@@ -390,15 +390,13 @@ public void setProtected(boolean isProtected) {
         data().setPersistent(NPC.DEFAULT_PROTECTED_METADATA, isProtected);
     }
 
-    private void teleport(final Entity entity, Location location, boolean loaded, int delay) {
-        if (!loaded)
-            location.getBlock().getChunk();
+    private void teleport(final Entity entity, Location location, int delay) {
         final Entity passenger = entity.getPassenger();
         entity.eject();
         entity.teleport(location);
         if (passenger == null)
             return;
-        teleport(passenger, location, true, delay++);
+        teleport(passenger, location, delay++);
         Runnable task = new Runnable() {
             @Override
             public void run() {
@@ -420,7 +418,8 @@ public void teleport(Location location, TeleportCause cause) {
         while (entity.getVehicle() != null) {
             entity = entity.getVehicle();
         }
-        teleport(entity, location, false, 5);
+        location.getBlock().getChunk();
+        teleport(entity, location, 5);
     }
 
     public void update() {
diff --git a/src/main/java/net/citizensnpcs/api/util/NBTStorage.java b/src/main/java/net/citizensnpcs/api/util/NBTStorage.java
index ed4a0a88..3f33d1e8 100644
--- a/src/main/java/net/citizensnpcs/api/util/NBTStorage.java
+++ b/src/main/java/net/citizensnpcs/api/util/NBTStorage.java
@@ -133,7 +133,7 @@ private String createRelativeKey(String parent, String sub) {
                 return parent;
             if (sub.charAt(0) == '.')
                 return parent.isEmpty() ? sub.substring(1, sub.length()) : parent + sub;
-                return parent.isEmpty() ? sub : parent + "." + sub;
+            return parent.isEmpty() ? sub : parent + "." + sub;
         }
 
         @Override