aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch')
-rw-r--r--Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch
new file mode 100644
index 0000000000..5fb2fb3269
--- /dev/null
+++ b/Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -0,0 +1,54 @@
+From 7fba4ae4accab404b762be87d632d645c9b067c0 Mon Sep 17 00:00:00 2001
+From: kashike <[email protected]>
+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
+index 96bb11005..7738ca385 100644
+--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
++++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
+@@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving {
+ public Vector3f rightArmPose;
+ public Vector3f leftLegPose;
+ public Vector3f rightLegPose;
++ public boolean canMove = true; // Paper
+
+ public EntityArmorStand(World world) {
+ super(world);
+@@ -763,4 +764,13 @@ public class EntityArmorStand extends EntityLiving {
+ public boolean cK() {
+ return false;
+ }
++
++ // 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
+index 2b66a08ad..8a06cb165 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+@@ -211,4 +211,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
+ public void setMarker(boolean marker) {
+ getHandle().setMarker(marker);
+ }
++
++ @Override
++ public boolean canMove() {
++ return getHandle().canMove;
++ }
++
++ @Override
++ public void setCanMove(boolean move) {
++ getHandle().canMove = move;
++ }
+ }
+--
+2.12.2
+