mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-17 18:47:40 +01:00
Don't damage ArmorStands that are already dead
This commit is contained in:
parent
24d21453cf
commit
314c8f06cc
2 changed files with 43 additions and 0 deletions
Spigot-Server-Patches
|
@ -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);
|
||||
--
|
|
@ -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()) {
|
||||
--
|
Loading…
Add table
Reference in a new issue