Don't damage ArmorStands that are already dead

Spigot-Server-Patches/Bump-thread-count-for-chunk-loading.patch

@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <1254957+zachbr@users.noreply.github.com>
+Date: Sun, 15 Nov 2015 19:36:37 -0600
+Subject: [PATCH] Bump thread count for chunk loading
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
++++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
+@@ -0,0 +0,0 @@ import net.minecraft.server.World;
+ import org.bukkit.craftbukkit.util.AsynchronousExecutor;
+ 
+ public class ChunkIOExecutor {
+-    static final int BASE_THREADS = 1;
++    static final int BASE_THREADS = 2; // PaperSpigot - Bumped value
+     static final int PLAYERS_PER_THREAD = 50;
+ 
+     private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
+--

Spigot-Server-Patches/Don-t-damage-already-dead-ArmorStands.patch

@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sun, 15 Nov 2015 19:35:31 -0600
+Subject: [PATCH] Don't damage already dead ArmorStands
+
+
+diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
++++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
+@@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
+             return false;
+         }
+         // CraftBukkit end
+-        if (this.world.isClientSide) {
++        if (this.world.isClientSide || this.dead) {
+             return false;
+-        } else if (DamageSource.OUT_OF_WORLD.equals(damagesource)) {
++        } else if (DamageSource.OUT_OF_WORLD.equals(damagesource)) { // PaperSpigot
+             this.die();
+             return false;
+         } else if (!this.isInvulnerable(damagesource) && !this.h && !this.s()) {
+--