2019-06-14 10:27:40 +08:00
|
|
|
From e9365a29ab4cec0deea0498aa8db4a1a2497b4ef Mon Sep 17 00:00:00 2001
|
2016-12-22 01:53:41 +08:00
|
|
|
From: kashike <kashike@vq.lc>
|
|
|
|
Date: Wed, 21 Dec 2016 11:47:25 -0600
|
|
|
|
Subject: [PATCH] Add API methods to control if armour stands can move
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
2019-06-06 23:36:57 +08:00
|
|
|
index bee5444989..1ae3ffa666 100644
|
2016-12-22 01:53:41 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
2019-04-27 14:26:04 +08:00
|
|
|
@@ -43,6 +43,7 @@ public class EntityArmorStand extends EntityLiving {
|
2016-12-22 01:53:41 +08:00
|
|
|
public Vector3f rightArmPose;
|
|
|
|
public Vector3f leftLegPose;
|
|
|
|
public Vector3f rightLegPose;
|
|
|
|
+ public boolean canMove = true; // Paper
|
|
|
|
|
2019-04-27 14:26:04 +08:00
|
|
|
public EntityArmorStand(EntityTypes<? extends EntityArmorStand> entitytypes, World world) {
|
|
|
|
super(entitytypes, world);
|
2019-05-26 09:56:30 +08:00
|
|
|
@@ -789,4 +790,13 @@ public class EntityArmorStand extends EntityLiving {
|
2019-04-27 14:26:04 +08:00
|
|
|
|
|
|
|
return this.getEntityType().j().a(f);
|
2016-12-22 01:53:41 +08:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
2019-04-27 14:26:04 +08:00
|
|
|
+ public void move(EnumMoveType moveType, Vec3D vec3d) {
|
2016-12-22 01:53:41 +08:00
|
|
|
+ if (this.canMove) {
|
2019-04-27 14:26:04 +08:00
|
|
|
+ super.move(moveType, vec3d);
|
2016-12-22 01:53:41 +08:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
2019-06-06 23:36:57 +08:00
|
|
|
index 2b66a08ade..124c3185bc 100644
|
2016-12-22 01:53:41 +08:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
2018-07-26 10:49:43 +08:00
|
|
|
@@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
|
2016-12-22 01:53:41 +08:00
|
|
|
public void setMarker(boolean marker) {
|
|
|
|
getHandle().setMarker(marker);
|
|
|
|
}
|
|
|
|
+
|
2018-07-26 10:49:43 +08:00
|
|
|
+ // Paper start
|
2016-12-22 01:53:41 +08:00
|
|
|
+ @Override
|
|
|
|
+ public boolean canMove() {
|
|
|
|
+ return getHandle().canMove;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setCanMove(boolean move) {
|
|
|
|
+ getHandle().canMove = move;
|
|
|
|
+ }
|
2018-07-26 10:49:43 +08:00
|
|
|
+ // Paper end
|
2016-12-22 01:53:41 +08:00
|
|
|
}
|
|
|
|
--
|
2019-04-23 05:36:14 +08:00
|
|
|
2.21.0
|
2016-12-22 01:53:41 +08:00
|
|
|
|