Fix /npc mushroomcow, increase base player speed

CitizensDev · May 6, 2020 · e1f7492 · e1f7492
1 parent e89cd03
commit e1f7492
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 27 deletions.
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/trait/Commands.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/trait/Commands.java
@@ -210,7 +210,7 @@ public void llama(CommandContext args, CommandSender sender, NPC npc) throws Com
             min = 1,
             max = 1,
             permission = "citizens.npc.mushroomcow")
-    @Requirements(selected = true, ownership = true, types = { EntityType.SHULKER })
+    @Requirements(selected = true, ownership = true, types = { EntityType.MUSHROOM_COW })
     public void mushroomcow(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
         MushroomCowTrait trait = npc.getTrait(MushroomCowTrait.class);
         boolean hasArg = false;
@@ -375,6 +375,29 @@ public void shulker(CommandContext args, CommandSender sender, NPC npc) throws C
         }
     }
 
+    @Command(
+            aliases = { "npc" },
+            usage = "snowman (-d[erp])",
+            desc = "Sets snowman modifiers.",
+            modifiers = { "snowman" },
+            min = 1,
+            max = 1,
+            flags = "d",
+            permission = "citizens.npc.snowman")
+    @Requirements(selected = true, ownership = true, types = { EntityType.SNOWMAN })
+    public void snowman(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
+        SnowmanTrait trait = npc.getTrait(SnowmanTrait.class);
+        boolean hasArg = false;
+        if (args.hasFlag('d')) {
+            boolean isDerp = trait.toggleDerp();
+            Messaging.sendTr(sender, isDerp ? Messages.SNOWMAN_DERP_SET : Messages.SNOWMAN_DERP_STOPPED, npc.getName());
+            hasArg = true;
+        }
+        if (!hasArg) {
+            throw new CommandUsageException();
+        }
+    }
+
     @Command(
             aliases = { "npc" },
             usage = "tfish (--body color) (--pattern pattern) (--patterncolor color)",
@@ -464,27 +487,4 @@ public void villager(CommandContext args, CommandSender sender, NPC npc) throws
             throw new CommandUsageException();
         }
     }
-
-    @Command(
-            aliases = { "npc" },
-            usage = "snowman (-d[erp])",
-            desc = "Sets snowman modifiers.",
-            modifiers = { "snowman" },
-            min = 1,
-            max = 1,
-            flags = "d",
-            permission = "citizens.npc.snowman")
-    @Requirements(selected = true, ownership = true, types = { EntityType.SNOWMAN })
-    public void snowman(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
-        SnowmanTrait trait = npc.getTrait(SnowmanTrait.class);
-        boolean hasArg = false;
-        if (args.hasFlag('d')) {
-            boolean isDerp = trait.toggleDerp();
-            Messaging.sendTr(sender, isDerp ? Messages.SNOWMAN_DERP_SET : Messages.SNOWMAN_DERP_STOPPED, npc.getName());
-            hasArg = true;
-        }
-        if (!hasArg) {
-            throw new CommandUsageException();
-        }
-    }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/trait/Commands.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/trait/Commands.java
@@ -249,7 +249,7 @@ public void llama(CommandContext args, CommandSender sender, NPC npc) throws Com
             min = 1,
             max = 1,
             permission = "citizens.npc.mushroomcow")
-    @Requirements(selected = true, ownership = true, types = { EntityType.SHULKER })
+    @Requirements(selected = true, ownership = true, types = { EntityType.MUSHROOM_COW })
     public void mushroomcow(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
         MushroomCowTrait trait = npc.getTrait(MushroomCowTrait.class);
         boolean hasArg = false;

diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerMove.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerMove.java
@@ -51,8 +51,6 @@ public void a() {
             AttributeInstance speed = this.a.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED);
             if (this.a instanceof EntitySlime) {
                 speed.setValue(0.3D * this.e);
-            } else {
-                speed.setValue(0.2D * this.e);
             }
             float movement = (float) (this.e * speed.getValue());
             this.a.o(movement);