CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't damage ArmorStands that are already dead

Browse Source
This commit is contained in:
Aikar 2015-11-15 19:40:32 -06:00 committed by Zach Brown
parent 5be55c33e4
commit fa810f3d47
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Spigot-Server-Patches/0071-Don-t-damage-already-dead-ArmorStands.patch Normal file
View File

@ -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

22
Spigot-Server-Patches/0072-Bump-thread-count-for-chunk-loading.patch Normal file
View File

@ -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