Add setSpeed calls to fix armorstand not working with movecontrol

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java

@@ -61,6 +61,7 @@ public class ArmorStandController extends MobEntityController {
         public EntityArmorStandNPC(World world, NPC npc) {
             super(world);
             this.npc = (CitizensNPC) npc;
+            NMS.setStepHeight(getBukkitEntity(), 1);
         }
 
         @Override

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerMove.java

@@ -82,6 +82,7 @@ public class PlayerControllerMove extends ControllerMove {
             this.a.yaw = a(this.a.yaw, f, 90.0F);
             NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw);
             this.a.bg = (float) (this.e * this.a.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue());
+            this.a.l(this.a.bg);
             if (a instanceof EntitySlime && h-- <= 0) {
                 this.h = new Random().nextInt(20) + 10;
                 this.h /= 3;

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java

@@ -59,6 +59,7 @@ public class ArmorStandController extends MobEntityController {
         public EntityArmorStandNPC(World world, NPC npc) {
             super(world);
             this.npc = (CitizensNPC) npc;
+            NMS.setStepHeight(getBukkitEntity(), 1);
         }
 
         @Override

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerMove.java

@@ -84,6 +84,7 @@ public class PlayerControllerMove extends ControllerMove {
             this.a.yaw = a(this.a.yaw, f, 90.0F);
             NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw);
             this.a.bf = (float) (this.e * this.a.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue());
+            this.a.l(this.a.bf);
             if (a instanceof EntitySlime && h-- <= 0) {
                 this.h = new Random().nextInt(20) + 10;
                 this.h /= 3;

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java

@@ -60,6 +60,7 @@ public class ArmorStandController extends MobEntityController {
         public EntityArmorStandNPC(World world, NPC npc) {
             super(world);
             this.npc = (CitizensNPC) npc;
+            NMS.setStepHeight(getBukkitEntity(), 1);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerMove.java

@@ -47,6 +47,7 @@ public class PlayerControllerMove extends ControllerMove {
             this.a.yaw = a(this.a.yaw, f, 90.0F);
             NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw);
             this.a.bg = (float) (this.e * this.a.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue());
+            this.a.k(this.a.bg);
             if (a instanceof EntitySlime && h-- <= 0) {
                 this.h = new Random().nextInt(20) + 10;
                 this.h /= 3;

v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java

@@ -62,6 +62,7 @@ public class ArmorStandController extends MobEntityController {
         public EntityArmorStandNPC(World world, NPC npc) {
             super(world);
             this.npc = (CitizensNPC) npc;
+            NMS.setStepHeight(getBukkitEntity(), 1);
         }
 
         @Override

v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerMove.java

@@ -49,6 +49,7 @@ public class PlayerControllerMove extends ControllerMove {
             this.a.yaw = a(this.a.yaw, f, 90.0F);
             NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw);
             this.a.bj = (float) (this.e * this.a.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue());
+            this.a.o(this.a.bj);
             if (a instanceof EntitySlime && h-- <= 0) {
                 this.h = new Random().nextInt(20) + 10;
                 this.h /= 3;

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java

@@ -64,6 +64,7 @@ public class ArmorStandController extends MobEntityController {
         public EntityArmorStandNPC(EntityTypes<? extends EntityArmorStand> types, World world, NPC npc) {
             super(types, world);
             this.npc = (CitizensNPC) npc;
+            NMS.setStepHeight(getBukkitEntity(), 1);
         }
 
         @Override

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerMove.java

@@ -48,6 +48,7 @@ public class PlayerControllerMove extends ControllerMove {
             this.a.yaw = a(this.a.yaw, f, 90.0F);
             NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw);
             this.a.bd = (float) (this.e * this.a.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getBaseValue());
+            this.a.o(this.a.bd);
             if (a instanceof EntitySlime && h-- <= 0) {
                 this.h = new Random().nextInt(20) + 10;
                 this.h /= 3;

v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java

@@ -57,6 +57,7 @@ public class ArmorStandController extends MobEntityController {
         public EntityArmorStandNPC(EntityTypes<? extends EntityArmorStand> types, World world, NPC npc) {
             super(types, world);
             this.npc = (CitizensNPC) npc;
+            NMS.setStepHeight(getBukkitEntity(), 1);
         }
 
         @Override

v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerMove.java

@@ -48,6 +48,7 @@ public class PlayerControllerMove extends ControllerMove {
             this.a.yaw = a(this.a.yaw, f, 90.0F);
             NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw);
             this.a.bb = (float) (this.e * this.a.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getBaseValue());
+            this.a.o(this.a.bb);
             if (a instanceof EntitySlime && h-- <= 0) {
                 this.h = new Random().nextInt(20) + 10;
                 this.h /= 3;

v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java

@@ -50,8 +50,8 @@ public class ArmorStandController extends MobEntityController {
 
     public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder, ForwardingMobAI {
         private MobAI ai;
-
         private final CitizensNPC npc;
+
         public EntityArmorStandNPC(EntityTypes<? extends EntityArmorStand> types, World world) {
             this(types, world, null);
         }
@@ -61,6 +61,7 @@ public class ArmorStandController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
             if (npc != null) {
                 ai = new BasicMobAI(this);
+                NMS.setStepHeight(getBukkitEntity(), 1);
             }
         }
 

v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityMoveControl.java

@@ -49,6 +49,7 @@ public class EntityMoveControl extends ControllerMove {
             this.a.yaw = a(this.a.yaw, f, 90.0F);
             NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw);
             this.a.aT = (float) (this.e * this.a.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getBaseValue());
+            this.a.q(this.a.aT);
             if (a instanceof EntitySlime && h-- <= 0) {
                 this.h = new Random().nextInt(20) + 10;
                 if (((EntitySlime) a).isAggressive()) {

v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java

@@ -49,8 +49,8 @@ public class ArmorStandController extends MobEntityController {
 
     public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder, ForwardingMobAI {
         private MobAI ai;
-
         private final CitizensNPC npc;
+
         public EntityArmorStandNPC(EntityType<? extends ArmorStand> types, Level level) {
             this(types, level, null);
         }
@@ -60,6 +60,7 @@ public class ArmorStandController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
             if (ai != null) {
                 ai = new BasicMobAI(this);
+                NMS.setStepHeight(getBukkitEntity(), 1);
             }
         }
 

v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityMoveControl.java

@@ -109,6 +109,7 @@ public class EntityMoveControl extends MoveControl {
                 NMS.setHeadYaw(entity.getBukkitEntity(), entity.getYRot());
             }
             this.entity.zza = (float) (this.speed * entity.getAttribute(Attributes.MOVEMENT_SPEED).getBaseValue());
+            this.entity.setSpeed(this.entity.zza);
             if (entity instanceof Slime && jumpTicks-- <= 0) {
                 this.jumpTicks = new Random().nextInt(20) + 10;
                 if (((Slime) entity).isAggressive()) {

v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java

@@ -51,8 +51,8 @@ public class ArmorStandController extends MobEntityController {
 
     public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder, ForwardingMobAI {
         private MobAI ai;
-
         private final CitizensNPC npc;
+
         public EntityArmorStandNPC(EntityType<? extends ArmorStand> types, Level level) {
             this(types, level, null);
         }
@@ -62,6 +62,7 @@ public class ArmorStandController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
             if (npc != null) {
                 ai = new BasicMobAI(this);
+                NMS.setStepHeight(getBukkitEntity(), 1);
             }
         }
 

v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityMoveControl.java

@@ -109,6 +109,7 @@ public class EntityMoveControl extends MoveControl {
                 NMS.setHeadYaw(entity.getBukkitEntity(), entity.getYRot());
             }
             this.entity.zza = (float) (this.speedMod * entity.getAttribute(Attributes.MOVEMENT_SPEED).getBaseValue());
+            this.entity.setSpeed(this.entity.zza);
             if (entity instanceof Slime && jumpTicks-- <= 0) {
                 this.jumpTicks = new Random().nextInt(20) + 10;
                 if (((Slime) entity).isAggressive()) {

v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ArmorStandController.java

@@ -51,8 +51,8 @@ public class ArmorStandController extends MobEntityController {
 
     public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder, ForwardingMobAI {
         private MobAI ai;
-
         private final CitizensNPC npc;
+
         public EntityArmorStandNPC(EntityType<? extends ArmorStand> types, Level level) {
             this(types, level, null);
         }
@@ -62,6 +62,7 @@ public class ArmorStandController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
             if (npc != null) {
                 ai = new BasicMobAI(this);
+                NMS.setStepHeight(getBukkitEntity(), 1);
             }
         }
 

v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityMoveControl.java

@@ -111,6 +111,7 @@ public class EntityMoveControl extends MoveControl {
             NMS.setHeadYaw(entity.getBukkitEntity(), entity.getYRot());
         }
         this.entity.zza = (float) (this.speedMod * entity.getAttribute(Attributes.MOVEMENT_SPEED).getBaseValue());
+        this.entity.setSpeed(this.entity.zza);
         if (entity instanceof Slime && jumpTicks-- <= 0) {
             this.jumpTicks = new Random().nextInt(20) + 10;
             if (((Slime) entity).isAggressive()) {

v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ArmorStandController.java

@@ -51,6 +51,7 @@ public class ArmorStandController extends MobEntityController {
         private MobAI ai;
 
         private final CitizensNPC npc;
+
         public EntityArmorStandNPC(EntityType<? extends ArmorStand> types, Level level) {
             this(types, level, null);
         }
@@ -60,6 +61,7 @@ public class ArmorStandController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
             if (npc != null) {
                 ai = new BasicMobAI(this);
+                NMS.setStepHeight(getBukkitEntity(), 1);
             }
         }
 

v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/EntityMoveControl.java

@@ -107,6 +107,7 @@ public class EntityMoveControl extends MoveControl {
             NMS.setHeadYaw(entity.getBukkitEntity(), entity.getYRot());
         }
         this.entity.zza = (float) (this.speedMod * entity.getAttribute(Attributes.MOVEMENT_SPEED).getBaseValue());
+        this.entity.setSpeed(entity.zza);
         if (entity instanceof Slime && jumpTicks-- <= 0) {
             this.jumpTicks = new Random().nextInt(20) + 10;
             if (((Slime) entity).isAggressive()) {

v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ArmorStandController.java

@@ -49,8 +49,8 @@ public class ArmorStandController extends MobEntityController {
 
     public static class EntityArmorStandNPC extends ArmorStand implements NPCHolder, ForwardingMobAI {
         private MobAI ai;
-
         private final CitizensNPC npc;
+
         public EntityArmorStandNPC(EntityType<? extends ArmorStand> types, Level level) {
             this(types, level, null);
         }
@@ -60,6 +60,7 @@ public class ArmorStandController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
             if (npc != null) {
                 ai = new BasicMobAI(this);
+                NMS.setStepHeight(getBukkitEntity(), 1);
             }
         }
 

v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/EntityMoveControl.java

@@ -107,6 +107,7 @@ public class EntityMoveControl extends MoveControl {
             NMS.setHeadYaw(entity.getBukkitEntity(), entity.getYRot());
         }
         this.entity.zza = (float) (this.speedMod * entity.getAttribute(Attributes.MOVEMENT_SPEED).getBaseValue());
+        this.entity.setSpeed(entity.zza);
         if (entity instanceof Slime && jumpTicks-- <= 0) {
             this.jumpTicks = new Random().nextInt(20) + 10;
             if (((Slime) entity).isAggressive()) {

v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java

@@ -58,6 +58,7 @@ public class ArmorStandController extends MobEntityController {
         public EntityArmorStandNPC(World world, NPC npc) {
             super(world);
             this.npc = (CitizensNPC) npc;
+            NMS.setStepHeight(getBukkitEntity(), 1);
         }
 
         @Override

v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerMove.java

@@ -81,6 +81,7 @@ public class PlayerControllerMove extends ControllerMove {
         this.a.yaw = a(this.a.yaw, f, 90.0F);
         NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw);
         this.a.ba = (float) (this.e * this.a.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue());
+        this.a.k(this.a.ba);
         if (a instanceof EntitySlime && h-- <= 0) {
             this.h = new Random().nextInt(20) + 10;
             this.h /= 3;