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

java/noppes/npcs/api/entity/ICustomNpc.java

@@ -890,19 +890,19 @@ public interface ICustomNpc<T extends EntityCreature> extends IEntityLiving<T>,
 
     void setFlySpeed(double flySpeed);
 
-    double getFlySpeed(double flySpeed);
+    double getFlySpeed();
 
     void setFlyGravity(double flyGravity);
 
-    double getFlyGravity(double flyGravity);
+    double getFlyGravity();
 
     void setFlyHeightLimit(int flyHeightLimit);
 
-    int getFlyHeightLimit(int flyHeightLimit);
+    int getFlyHeightLimit();
 
     void limitFlyHeight(boolean limit);
 
-    boolean isFlyHeightLimited(boolean limit);
+    boolean isFlyHeightLimited();
 
     void setSpeed(double speed);
 

java/noppes/npcs/api/handler/data/IMagic.java

@@ -0,0 +1,18 @@
+package noppes.npcs.api.handler.data;
+
+import noppes.npcs.api.entity.ICustomNpc;
+import noppes.npcs.api.entity.IPlayer;
+
+public interface IMagic {
+    int getId();
+
+    String getName();
+
+    void setName(String name);
+
+    void setColor(int c);
+
+    int getColor();
+
+    void save();
+}