From cec6d51e8331ce1bfd9d6f3da8ee5f5ce4fce723 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 22 Aug 2019 13:20:07 -0500 Subject: [PATCH] Rebuild patches --- .../0011-Make-giants-naturally-spawn-and-have-AI.patch | 6 +++--- .../server/0030-Make-illusioners-naturally-spawn.patch | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/server/0011-Make-giants-naturally-spawn-and-have-AI.patch b/patches/server/0011-Make-giants-naturally-spawn-and-have-AI.patch index cb9af84a1..f24f1b7c9 100644 --- a/patches/server/0011-Make-giants-naturally-spawn-and-have-AI.patch +++ b/patches/server/0011-Make-giants-naturally-spawn-and-have-AI.patch @@ -1,4 +1,4 @@ -From 609835c609d98c4315db23388bca76fc157630c9 Mon Sep 17 00:00:00 2001 +From a709dcbc1a7e628afba4752c839728cf28d876e4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 12 May 2019 00:43:12 -0500 Subject: [PATCH] Make giants naturally spawn and have AI @@ -103,7 +103,7 @@ index 29e7639ad..e69e7a456 100644 } } diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 9d4a96ae4..49d1b7898 100644 +index 9d4a96ae4..694075cb1 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -77,6 +77,14 @@ public final class SpawnerCreature { @@ -113,7 +113,7 @@ index 9d4a96ae4..49d1b7898 100644 + // Purpur start + if (entitytypes == EntityTypes.GIANT) { + if (!net.pl3x.purpur.PurpurConfig.giantsNaturallySpawn) { -+ return amountSpawned; ++ return i; + } + } + // Purpur end diff --git a/patches/server/0030-Make-illusioners-naturally-spawn.patch b/patches/server/0030-Make-illusioners-naturally-spawn.patch index cac9cbdad..441b0504d 100644 --- a/patches/server/0030-Make-illusioners-naturally-spawn.patch +++ b/patches/server/0030-Make-illusioners-naturally-spawn.patch @@ -1,4 +1,4 @@ -From 66cc6181d6b8b5a3c2b962ba058a83cc64d54494 Mon Sep 17 00:00:00 2001 +From db58cdb29dadd76ea00bbc89d7af6236ac985874 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jul 2019 11:09:25 -0500 Subject: [PATCH] Make illusioners naturally spawn @@ -39,16 +39,16 @@ index b075ee4ec..48dcab2d9 100644 private static void addSpawn(String biome, EnumCreatureType ct, EntityTypes et, int weight, int min_group, int max_group) { diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 49d1b7898..a60ada26d 100644 +index 694075cb1..966ef81c6 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -82,6 +82,10 @@ public final class SpawnerCreature { if (!net.pl3x.purpur.PurpurConfig.giantsNaturallySpawn) { - return amountSpawned; + return i; } + } else if (entitytypes == EntityTypes.ILLUSIONER) { + if (!net.pl3x.purpur.PurpurConfig.illusionersNaturallySpawn) { -+ return amountSpawned; ++ return i; + } } // Purpur end