From 8cca54c0e3b1fc8b69fc1ed08682e1f6a0f816b8 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 8 Apr 2018 01:44:14 +0100 Subject: [PATCH] remove warning for custom entities in precreaturespawn (closes #1069) There can be no survivors. --- .../0083-Don-t-teleport-dead-entities.patch | 4 ++-- .../0084-Optimize-Chunk-Access.patch | 6 +++--- ...figurable-spawn-chances-for-skeleton-horses.patch | 4 ++-- .../0259-PreCreatureSpawnEvent.patch | 12 +++++------- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Spigot-Server-Patches/0083-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0083-Don-t-teleport-dead-entities.patch index 75da1205e8..ec4d0387fd 100644 --- a/Spigot-Server-Patches/0083-Don-t-teleport-dead-entities.patch +++ b/Spigot-Server-Patches/0083-Don-t-teleport-dead-entities.patch @@ -1,4 +1,4 @@ -From e594a3257525209852256ac7ab6dcd50aaf7ed4c Mon Sep 17 00:00:00 2001 +From ce02c4c108a6e9e282badb7ff325afa7f67e3d80 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:55:23 -0400 Subject: [PATCH] Don't teleport dead entities @@ -20,5 +20,5 @@ index 776e931c1..e1e918b21 100644 WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle(); int i = worldserver1.dimension; -- -2.16.2 +2.17.0 diff --git a/Spigot-Server-Patches/0084-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0084-Optimize-Chunk-Access.patch index c7fc483514..fc292c7b0f 100644 --- a/Spigot-Server-Patches/0084-Optimize-Chunk-Access.patch +++ b/Spigot-Server-Patches/0084-Optimize-Chunk-Access.patch @@ -1,4 +1,4 @@ -From 895c7044c86e42baa2d33241050f436c21315ec9 Mon Sep 17 00:00:00 2001 +From 2d8186c30c160fea877ea00f58a79ad891196543 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 27 Aug 2015 01:15:02 -0400 Subject: [PATCH] Optimize Chunk Access @@ -9,7 +9,7 @@ getChunkAt is called for the same chunk multiple times in a row, often from getT Optimize this look up by using a Last Access cache. diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 4e51585a..15814f66 100644 +index 4e7e8e5fd..1771a1794 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -27,7 +27,27 @@ public class ChunkProviderServer implements IChunkProvider { @@ -42,5 +42,5 @@ index 4e51585a..15814f66 100644 public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) { -- -2.14.3 +2.17.0 diff --git a/Spigot-Server-Patches/0085-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0085-Configurable-spawn-chances-for-skeleton-horses.patch index 12db301e55..c42a548bfb 100644 --- a/Spigot-Server-Patches/0085-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0085-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,4 +1,4 @@ -From 32ea091c63092b3c8c17059ea2b44fbdf207a088 Mon Sep 17 00:00:00 2001 +From 07f755e88aee46ffac5a68549c22d5f06415a2e9 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 22 Mar 2016 12:04:28 -0500 Subject: [PATCH] Configurable spawn chances for skeleton horses @@ -32,5 +32,5 @@ index 9ef492f1b..72dc20087 100644 entityhorseskeleton.p(true); -- -2.14.3 +2.17.0 diff --git a/Spigot-Server-Patches/0259-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0259-PreCreatureSpawnEvent.patch index 2a806c1792..ddf998fa1b 100644 --- a/Spigot-Server-Patches/0259-PreCreatureSpawnEvent.patch +++ b/Spigot-Server-Patches/0259-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From 4cb187dd3ca69fc416f369cd3b369126efd023b4 Mon Sep 17 00:00:00 2001 +From a459698038d1d6211dc49b2a0a1eb7749d3b22d2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:01:31 -0500 Subject: [PATCH] PreCreatureSpawnEvent @@ -15,7 +15,7 @@ instead and save a lot of server resources. See: https://github.com/PaperMC/Paper/issues/917 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 87fe4775..9d580ea0 100644 +index 87fe4775f..9466bcdc7 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -1,6 +1,7 @@ @@ -26,7 +26,7 @@ index 87fe4775..9d580ea0 100644 import java.util.Iterator; import java.util.List; import javax.annotation.Nullable; -@@ -87,6 +88,29 @@ public abstract class MobSpawnerAbstract { +@@ -87,6 +88,27 @@ public abstract class MobSpawnerAbstract { double d3 = j >= 1 ? nbttaglist.f(0) : (double) blockposition.getX() + (world.random.nextDouble() - world.random.nextDouble()) * (double) this.spawnRange + 0.5D; double d4 = j >= 2 ? nbttaglist.f(1) : (double) (blockposition.getY() + world.random.nextInt(3) - 1); double d5 = j >= 3 ? nbttaglist.f(2) : (double) blockposition.getZ() + (world.random.nextDouble() - world.random.nextDouble()) * (double) this.spawnRange + 0.5D; @@ -49,15 +49,13 @@ index 87fe4775..9d580ea0 100644 + } + continue; + } -+ } else { -+ MinecraftServer.LOGGER.warn("Warning, could not find EntityType for " + key + " - Please report this to Paper at https://github.com/PaperMC/Paper/issues"); + } + // Paper end Entity entity = ChunkRegionLoader.a(nbttagcompound, world, d3, d4, d5, false); if (entity == null) { diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 2cd06382..e217d334 100644 +index 2cd063829..e217d3340 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -184,6 +184,25 @@ public final class SpawnerCreature { @@ -87,5 +85,5 @@ index 2cd06382..e217d334 100644 try { -- -2.14.3 +2.17.0