Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/java/noppes/npcs/client/gui/SubGuiAnimationOptions.java

src/main/java/noppes/npcs/client/ClientTickHandler.java

@@ -63,8 +63,9 @@ public class ClientTickHandler{
 		} else if (MusicController.Instance.isPlaying() && MusicController.Instance.getEntity() != null) {
             Entity entity = MusicController.Instance.getEntity();
             if (MusicController.Instance.getOffRange() > 0 &&
-                (Minecraft.getMinecraft().thePlayer.getDistanceToEntity(entity) > MusicController.Instance.getOffRange()
-                ||  entity.dimension != Minecraft.getMinecraft().thePlayer.dimension)) {
+                (Minecraft.getMinecraft().thePlayer == null ||
+                    Minecraft.getMinecraft().thePlayer.getDistanceToEntity(entity) > MusicController.Instance.getOffRange() ||
+                    entity.dimension != Minecraft.getMinecraft().thePlayer.dimension)) {
                 MusicController.Instance.stopMusic();
             }
         }

src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java

@@ -6,12 +6,13 @@ import noppes.npcs.controllers.data.Frame;
 
 public class SubGuiAnimationFrame extends SubGuiInterface implements ITextfieldListener {
     private final Frame editingFrame;
-    
+
     public SubGuiAnimationFrame(Frame editingFrame) {
         this.editingFrame = editingFrame;
         setBackground("smallbg.png");
+        this.closeOnEsc = true;
     }
-    
+
     @Override
     public void initGui() {
         super.initGui();

src/main/java/noppes/npcs/client/gui/SubGuiAnimationOptions.java

@@ -12,7 +12,7 @@ public class SubGuiAnimationOptions extends SubGuiInterface {
     public SubGuiAnimationOptions(Animation animation) {
         this.animation = animation;
         setBackground("smallbg.png");
-        closeOnEsc = true;
+        this.closeOnEsc = true;
     }
 
     @Override
@@ -51,7 +51,6 @@ public class SubGuiAnimationOptions extends SubGuiInterface {
             animation.whileMoving = value == 0;
         }
 
-
         initGui();
     }
 }