Update entity model sizes

/ent and /model now have specific min/max models sizes based on player rank and if it is being applied to an entity/bot or not.

Author: 123DMWM

fCraft/Commands/CpeCommands.cs

@@ -138,7 +138,7 @@ private static void EntityHandler(Player player, CommandReader cmd) {
                     string requestedModel = "humanoid";
                     if (cmd.HasNext) {
                         requestedModel = cmd.Next().ToLower();
-                        requestedModel = ParseModel(player, requestedModel);
+                        requestedModel = ParseModel(player, requestedModel, true);
                         if (requestedModel == null) {
                             player.Message(
                                 "That wasn't a valid entity model! Valid models are chibi, chicken, creeper, giant, human, pig, sheep, skeleton, spider, zombie, or any block ID/Name.");
@@ -174,7 +174,7 @@ private static void EntityHandler(Player player, CommandReader cmd) {
                         	player.Message("Usage is /Ent model <bot> <model>. " + validModels);
                             break;
                         }
-                        model = ParseModel(player, model);
+                        model = ParseModel(player, model, true);
                         if (model == null) {
                             player.Message("That wasn't a valid entity model! " + validModels);
                             break;
@@ -332,7 +332,7 @@ static void SetModel(Player player, CommandReader cmd, string prefix,
                 return;
             }
 
-            model = ParseModel(player, model);
+            model = ParseModel(player, model, false);
             if (model == null) {
                 player.Message("Model not valid, see &H/Help {0}Model&S.", prefix.TrimEnd());
                 return;
@@ -354,19 +354,33 @@ static void SetModel(Player player, CommandReader cmd, string prefix,
             setter(target, model);
         }
 
-        internal static string ParseModel(Player player, string model) {
+        internal static string ParseModel(Player player, string model, bool isBot) {
             model = model ?? "humanoid";
-            float scale = 0.0f;
             string scalestr = "";
             int sepIndex = model.IndexOf('|');
 
             if (sepIndex >= 0) {
                 scalestr = model.Substring(sepIndex + 1);
                 model = model.Substring(0, sepIndex);
             }
-            if (float.TryParse(scalestr, out scale)) {
-                if (scale < 0.25f) scale = 0.25f;
-                if (scale > 3f) scale = 3f;
+            if (float.TryParse(scalestr, out float scale)) {
+                if (player.Info.Rank == RankManager.HighestRank) {
+                    if (isBot) { //Owner Bot scale between 0.01 and 128
+                        if (scale < 0.01f) scale = 0.01f;
+                        if (scale > 128f) scale = 128f;
+                    } else {//Owner Self scale between 0.1 and 10
+                        if (scale < 0.1f) scale = 0.1f;
+                        if (scale > 10f) scale = 10f;
+                    }
+                } else {
+                    if (isBot) {//Player Bot scale between 0.1 and 10
+                        if (scale < 0.1f) scale = 0.1f;
+                        if (scale > 10f) scale = 10f;
+                    } else {//Player Self scale between 0.25 and 2
+                        if (scale < 0.25f) scale = 0.25f;
+                        if (scale > 2f) scale = 2f;
+                    }
+                }
             }
 
             byte blockId;

fCraft/World/Entity.cs

@@ -226,7 +226,7 @@ public static void OldLoad() {
                 if (Path.GetExtension(filename) != ".txt") continue;
 
                 string[] entityData = File.ReadAllLines(filename);
-                entity.Model = CpeCommands.ParseModel(Player.Console, entityData[2]) ?? "humanoid";
+                entity.Model = CpeCommands.ParseModel(Player.Console, entityData[2], true) ?? "humanoid";
                 entity.World = entityData[4];
 
                 sbyte id;