Spigot has patched this issue inside MapIcon, meaning that we no longer need to maintain this patch; Spigots patch also fixes #668 in that it will verify the length of the array, as well as protect against a negative type value being fetched from the array. Only real change is that Spigots patch returns a MapIcon.Type.PLAYER, instead of the RED_MARKER as originally PR'd by Aikar.
		
			
				
	
	
		
			34 lines
		
	
	
		
			No EOL
		
	
	
		
			1.1 KiB
			
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			34 lines
		
	
	
		
			No EOL
		
	
	
		
			1.1 KiB
			
		
	
	
	
		
			Diff
		
	
	
	
	
	
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 | 
						|
From: Riley Park <rileysebastianpark@gmail.com>
 | 
						|
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/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
 | 
						|
index b4f04517..099da6ce 100644
 | 
						|
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
 | 
						|
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
 | 
						|
@@ -0,0 +0,0 @@ public interface ArmorStand extends LivingEntity {
 | 
						|
      * @param marker whether this is a marker
 | 
						|
      */
 | 
						|
     void setMarker(boolean marker);
 | 
						|
+
 | 
						|
+    // Paper start
 | 
						|
+    /**
 | 
						|
+     * Tests if this armor stand can move.
 | 
						|
+     *
 | 
						|
+     * <p>The default value is {@code true}.</p>
 | 
						|
+     *
 | 
						|
+     * @return {@code true} if this armour stand can move, {@code false} otherwise
 | 
						|
+     */
 | 
						|
+    boolean canMove();
 | 
						|
+
 | 
						|
+    /**
 | 
						|
+     * Sets if this armor stand can move.
 | 
						|
+     *
 | 
						|
+     * @param move {@code true} if this armour stand can move, {@code false} otherwise
 | 
						|
+     */
 | 
						|
+    void setCanMove(boolean move);
 | 
						|
+    // Paper end
 | 
						|
 }
 | 
						|
--
 |