Fixed issue with chairLoc being null

EngineHub · Aug 24, 2016 · 9e7bd2f · 9e7bd2f
1 parent 86c223b
commit 9e7bd2f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/com/sk89q/craftbook/mechanics/Chair.java b/src/main/java/com/sk89q/craftbook/mechanics/Chair.java
@@ -72,7 +72,8 @@ private void addChair(final Player player, Block block, final Location chairLoc)
         }
 
         ar = fixArrow(block, ar);
-        ar.getLocation().setYaw(chairLoc.getYaw());
+        if (chairLoc != null)
+            ar.getLocation().setYaw(chairLoc.getYaw());
 
         if (hasUpdated && ar != chairs.get(player.getName()).chairEntity)
             isNew = true;
@@ -86,7 +87,8 @@ private void addChair(final Player player, Block block, final Location chairLoc)
             Bukkit.getScheduler().runTask(CraftBookPlugin.inst(), new Runnable() {
                 @Override
                 public void run () {
-                    player.teleport(chairLoc);
+                    if (chairLoc != null)
+                        player.teleport(chairLoc);
                     far.setPassenger(player);
                 }
             });