diff --git a/Spigot-Server-Patches/Bump-thread-count-for-chunk-loading.patch b/Spigot-Server-Patches/Bump-thread-count-for-chunk-loading.patch new file mode 100644 index 000000000..a5cd067c2 --- /dev/null +++ b/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 instance = new AsynchronousExecutor(new ChunkIOProvider(), BASE_THREADS); +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Don-t-damage-already-dead-ArmorStands.patch b/Spigot-Server-Patches/Don-t-damage-already-dead-ArmorStands.patch new file mode 100644 index 000000000..eb89a3389 --- /dev/null +++ b/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 +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()) { +-- \ No newline at end of file