From 2247a811508e236f78664791f942de70a2454f5f Mon Sep 17 00:00:00 2001 From: fullwall Date: Sat, 19 Oct 2024 20:01:27 +0800 Subject: [PATCH] Add setSpeed calls to fix armorstand not working with movecontrol --- .../citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java | 1 + .../citizensnpcs/nms/v1_10_R1/util/PlayerControllerMove.java | 1 + .../citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java | 1 + .../citizensnpcs/nms/v1_11_R1/util/PlayerControllerMove.java | 1 + .../citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java | 1 + .../citizensnpcs/nms/v1_12_R1/util/PlayerControllerMove.java | 1 + .../citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java | 1 + .../citizensnpcs/nms/v1_13_R2/util/PlayerControllerMove.java | 1 + .../citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java | 1 + .../citizensnpcs/nms/v1_14_R1/util/PlayerControllerMove.java | 1 + .../citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java | 1 + .../citizensnpcs/nms/v1_15_R1/util/PlayerControllerMove.java | 1 + .../citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java | 3 ++- .../net/citizensnpcs/nms/v1_16_R3/util/EntityMoveControl.java | 1 + .../citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java | 3 ++- .../net/citizensnpcs/nms/v1_17_R1/util/EntityMoveControl.java | 1 + .../citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java | 3 ++- .../net/citizensnpcs/nms/v1_18_R2/util/EntityMoveControl.java | 1 + .../citizensnpcs/nms/v1_19_R3/entity/ArmorStandController.java | 3 ++- .../net/citizensnpcs/nms/v1_19_R3/util/EntityMoveControl.java | 1 + .../citizensnpcs/nms/v1_20_R4/entity/ArmorStandController.java | 2 ++ .../net/citizensnpcs/nms/v1_20_R4/util/EntityMoveControl.java | 1 + .../citizensnpcs/nms/v1_21_R1/entity/ArmorStandController.java | 3 ++- .../net/citizensnpcs/nms/v1_21_R1/util/EntityMoveControl.java | 1 + .../citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java | 1 + .../citizensnpcs/nms/v1_8_R3/util/PlayerControllerMove.java | 1 + 26 files changed, 32 insertions(+), 5 deletions(-) diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java index ebf5884f0..5790aa05d 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java +++ b/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 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerMove.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerMove.java index fc1228cca..5b2a65641 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerMove.java +++ b/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; diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java index ea0ebbd3c..c9c69e0ab 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java +++ b/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 diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerMove.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerMove.java index 882f202e5..ba1e68166 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerMove.java +++ b/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; diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java index a6137f6d5..5057e4622 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java +++ b/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 diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerMove.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerMove.java index a3645bd88..73d1d51aa 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerMove.java +++ b/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; diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java index 4434dcde4..0dfd24688 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java +++ b/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 diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerMove.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerMove.java index 71f711d4f..8813b41fb 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerMove.java +++ b/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; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java index 8ee243985..02c105f47 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java +++ b/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 types, World world, NPC npc) { super(types, world); this.npc = (CitizensNPC) npc; + NMS.setStepHeight(getBukkitEntity(), 1); } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerMove.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerMove.java index 1566426d3..5e7ebcf77 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerMove.java +++ b/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; diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java index 759201b4b..53dec63ba 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java +++ b/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 types, World world, NPC npc) { super(types, world); this.npc = (CitizensNPC) npc; + NMS.setStepHeight(getBukkitEntity(), 1); } @Override 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 index 82d09a1be..e6b76e984 100644 --- 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 @@ -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; diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java index 33b50b22b..860558187 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java +++ b/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 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); } } diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityMoveControl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityMoveControl.java index 3cd2a28a1..815cd4698 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityMoveControl.java +++ b/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()) { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java index 8dc619322..63adc9944 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java +++ b/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 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); } } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityMoveControl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityMoveControl.java index ffc1d9ecc..785186b1f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityMoveControl.java +++ b/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()) { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java index 503b7ff27..16d4d6416 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java +++ b/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 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); } } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityMoveControl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityMoveControl.java index 6185d5ef2..079388763 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityMoveControl.java +++ b/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()) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ArmorStandController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ArmorStandController.java index 39fbbeba5..1fe0e75e4 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ArmorStandController.java +++ b/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 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); } } diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityMoveControl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityMoveControl.java index daa63b398..02e0f95a9 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityMoveControl.java +++ b/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()) { diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ArmorStandController.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ArmorStandController.java index 094489e9d..18c3f9bdb 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/ArmorStandController.java +++ b/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 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); } } diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/EntityMoveControl.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/EntityMoveControl.java index 6757ebcd2..6911a0b7d 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/EntityMoveControl.java +++ b/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()) { diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ArmorStandController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ArmorStandController.java index bbefbbe9e..c432ebaf4 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/ArmorStandController.java +++ b/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 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); } } diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/EntityMoveControl.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/EntityMoveControl.java index 584b27e41..e2682b8b0 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/EntityMoveControl.java +++ b/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()) { diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java index 8281657f9..7dcae31a4 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java +++ b/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 diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerMove.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerMove.java index a44c4e87b..16547154a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerMove.java +++ b/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;