2019-07-16 22:09:32 +00:00
|
|
|
From 66befc2b6f14be3178930d89c6d392a763f8bba3 Mon Sep 17 00:00:00 2001
|
2016-12-21 17:53:41 +00: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-07-16 22:09:32 +00:00
|
|
|
index 2ba9cc9fe..ccdd0d27e 100644
|
2016-12-21 17:53:41 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
2019-04-27 06:26:04 +00:00
|
|
|
@@ -43,6 +43,7 @@ public class EntityArmorStand extends EntityLiving {
|
2016-12-21 17:53:41 +00:00
|
|
|
public Vector3f rightArmPose;
|
|
|
|
public Vector3f leftLegPose;
|
|
|
|
public Vector3f rightLegPose;
|
|
|
|
+ public boolean canMove = true; // Paper
|
|
|
|
|
2019-04-27 06:26:04 +00:00
|
|
|
public EntityArmorStand(EntityTypes<? extends EntityArmorStand> entitytypes, World world) {
|
|
|
|
super(entitytypes, world);
|
2019-05-26 01:56:30 +00:00
|
|
|
@@ -789,4 +790,13 @@ public class EntityArmorStand extends EntityLiving {
|
2019-04-27 06:26:04 +00:00
|
|
|
|
|
|
|
return this.getEntityType().j().a(f);
|
2016-12-21 17:53:41 +00:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
2019-04-27 06:26:04 +00:00
|
|
|
+ public void move(EnumMoveType moveType, Vec3D vec3d) {
|
2016-12-21 17:53:41 +00:00
|
|
|
+ if (this.canMove) {
|
2019-04-27 06:26:04 +00:00
|
|
|
+ super.move(moveType, vec3d);
|
2016-12-21 17:53:41 +00: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-07-16 22:09:32 +00:00
|
|
|
index 2b66a08ad..124c3185b 100644
|
2016-12-21 17:53:41 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
2018-07-26 02:49:43 +00:00
|
|
|
@@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
|
2016-12-21 17:53:41 +00:00
|
|
|
public void setMarker(boolean marker) {
|
|
|
|
getHandle().setMarker(marker);
|
|
|
|
}
|
|
|
|
+
|
2018-07-26 02:49:43 +00:00
|
|
|
+ // Paper start
|
2016-12-21 17:53:41 +00:00
|
|
|
+ @Override
|
|
|
|
+ public boolean canMove() {
|
|
|
|
+ return getHandle().canMove;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setCanMove(boolean move) {
|
|
|
|
+ getHandle().canMove = move;
|
|
|
|
+ }
|
2018-07-26 02:49:43 +00:00
|
|
|
+ // Paper end
|
2016-12-21 17:53:41 +00:00
|
|
|
}
|
|
|
|
--
|
2019-06-25 19:18:50 +00:00
|
|
|
2.22.0
|
2016-12-21 17:53:41 +00:00
|
|
|
|