2018-09-29 01:31:59 +02:00
|
|
|
From d041c357b3b534885061522f9ee31e5637d718dc Mon Sep 17 00:00:00 2001
|
2016-12-21 18:53:41 +01: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
|
2018-08-26 20:11:49 +02:00
|
|
|
index 5485c4bff3..00a46129b8 100644
|
2016-12-21 18:53:41 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
2018-07-17 22:32:05 +02:00
|
|
|
@@ -44,6 +44,7 @@ public class EntityArmorStand extends EntityLiving {
|
2016-12-21 18:53:41 +01:00
|
|
|
public Vector3f rightArmPose;
|
|
|
|
public Vector3f leftLegPose;
|
|
|
|
public Vector3f rightLegPose;
|
|
|
|
+ public boolean canMove = true; // Paper
|
|
|
|
|
|
|
|
public EntityArmorStand(World world) {
|
2018-07-17 22:32:05 +02:00
|
|
|
super(EntityTypes.ARMOR_STAND, world);
|
2018-08-26 20:11:49 +02:00
|
|
|
@@ -757,4 +758,13 @@ public class EntityArmorStand extends EntityLiving {
|
2018-07-22 07:27:46 +02:00
|
|
|
public boolean df() {
|
2017-11-08 17:13:57 +01:00
|
|
|
return false;
|
2016-12-21 18:53:41 +01:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
|
|
|
+ public void move(EnumMoveType moveType, double x, double y, double z) {
|
|
|
|
+ if (this.canMove) {
|
|
|
|
+ super.move(moveType, x, y, z);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
2018-08-06 01:46:43 +02:00
|
|
|
index 2b66a08ade..124c3185bc 100644
|
2016-12-21 18:53:41 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
2018-07-26 04:49:43 +02:00
|
|
|
@@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
|
2016-12-21 18:53:41 +01:00
|
|
|
public void setMarker(boolean marker) {
|
|
|
|
getHandle().setMarker(marker);
|
|
|
|
}
|
|
|
|
+
|
2018-07-26 04:49:43 +02:00
|
|
|
+ // Paper start
|
2016-12-21 18:53:41 +01:00
|
|
|
+ @Override
|
|
|
|
+ public boolean canMove() {
|
|
|
|
+ return getHandle().canMove;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setCanMove(boolean move) {
|
|
|
|
+ getHandle().canMove = move;
|
|
|
|
+ }
|
2018-07-26 04:49:43 +02:00
|
|
|
+ // Paper end
|
2016-12-21 18:53:41 +01:00
|
|
|
}
|
|
|
|
--
|
2018-09-29 01:31:59 +02:00
|
|
|
2.19.0
|
2016-12-21 18:53:41 +01:00
|
|
|
|