From fa810f3d473b106cf2fe5dda5a04e5aaf0923bda Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 15 Nov 2015 19:40:32 -0600
Subject: [PATCH] Don't damage ArmorStands that are already dead

---
 ...on-t-damage-already-dead-ArmorStands.patch | 25 +++++++++++++++++++
 ...-Bump-thread-count-for-chunk-loading.patch | 22 ++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 Spigot-Server-Patches/0071-Don-t-damage-already-dead-ArmorStands.patch
 create mode 100644 Spigot-Server-Patches/0072-Bump-thread-count-for-chunk-loading.patch

diff --git a/Spigot-Server-Patches/0071-Don-t-damage-already-dead-ArmorStands.patch b/Spigot-Server-Patches/0071-Don-t-damage-already-dead-ArmorStands.patch
new file mode 100644
index 0000000000..b77304dea4
--- /dev/null
+++ b/Spigot-Server-Patches/0071-Don-t-damage-already-dead-ArmorStands.patch
@@ -0,0 +1,25 @@
+From e9deaf4147f5d5cff346d3af8e68a91e67682322 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 cd57d69..2ea4a5f 100644
+--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
++++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
+@@ -382,9 +382,9 @@ 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()) {
+-- 
+2.6.3
+
diff --git a/Spigot-Server-Patches/0072-Bump-thread-count-for-chunk-loading.patch b/Spigot-Server-Patches/0072-Bump-thread-count-for-chunk-loading.patch
new file mode 100644
index 0000000000..c92479f747
--- /dev/null
+++ b/Spigot-Server-Patches/0072-Bump-thread-count-for-chunk-loading.patch
@@ -0,0 +1,22 @@
+From c128310e73948cd22b1912eff4f5fc234427a681 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.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 e4fd9bc..69e5da4 100644
+--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
++++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
+@@ -7,7 +7,7 @@ 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);
+-- 
+2.6.3
+