mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
378bbf478c
Upstream has released updates that appears to apply and compile correctly Paper Changes: 8812fed9 Merge pull request #2240 from Spottedleaf/anti-xray bd46b639 Merge branch 'ver/1.14' of github.com:PaperMC/Paper into anti-xray e679a7c1 Config migrations 0a667728 Resolve crash issue by shoving chunk loads onto the next tick 3a2d7f2d Merge branch 'ver/1.14' of github.com:PaperMC/Paper into anti-xray 5ffa0dae Do not force load chunks for plugin constructed packets e993aa6f Merge branch 'ver/1.14' of github.com:PaperMC/Paper into anti-xray 9a4a185f Keep neighbour chunks loaded while obfuscating f1f8060a Fix build? 76eb2a5e Use getChunkIfLoadedImmediately not getChunkIfCachedImmediately ad757f96 Delete 0335-Anti-Xray.patch 46a6f1b2 Re-Add Anti-Xray
59 lines
3.5 KiB
Diff
59 lines
3.5 KiB
Diff
From de0894c8d4724da12f1af6da50757e75a815487f Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Fri, 5 Jul 2019 11:09:25 -0500
|
|
Subject: [PATCH] Make illusioners naturally spawn
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/Biomes.java | 18 ++++++++++++++++++
|
|
.../java/net/pl3x/purpur/PurpurConfig.java | 5 +++++
|
|
2 files changed, 23 insertions(+)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java
|
|
index 3f7f7a2de..38284a62b 100644
|
|
--- a/src/main/java/net/minecraft/server/Biomes.java
|
|
+++ b/src/main/java/net/minecraft/server/Biomes.java
|
|
@@ -112,6 +112,24 @@ public abstract class Biomes {
|
|
addSpawn("eroded_badlands", EnumCreatureType.MONSTER, EntityTypes.GIANT, 10, 1, 2);
|
|
addSpawn("modified_badlands_plateau", EnumCreatureType.MONSTER, EntityTypes.GIANT, 10, 2, 1);
|
|
}
|
|
+ if (net.pl3x.purpur.PurpurConfig.illusionersNaturallySpawn) {
|
|
+ addSpawn("plains", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 5, 1, 1);
|
|
+ addSpawn("sunflower_plains", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 5, 1, 1);
|
|
+ addSpawn("desert", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 5, 1, 1);
|
|
+ addSpawn("desert_hills", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 5, 1, 1);
|
|
+ addSpawn("desert_lakes", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 5, 1, 1);
|
|
+ addSpawn("mountains", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 5, 1, 1);
|
|
+ addSpawn("gravelly_mountains", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 5, 1, 1);
|
|
+ addSpawn("modified_gravelly_mountains", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 5, 1, 1);
|
|
+ addSpawn("savanna", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 5, 1, 1);
|
|
+ addSpawn("savanna_plateau", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 5, 1, 1);
|
|
+ addSpawn("shattered_savanna", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 5, 1, 1);
|
|
+ addSpawn("shattered_savanna_plateau", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 5, 1, 1);
|
|
+ addSpawn("badlands", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 10, 1, 1);
|
|
+ addSpawn("badlands_plateau", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 10, 1, 1);
|
|
+ addSpawn("eroded_badlands", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 10, 1, 1);
|
|
+ addSpawn("modified_badlands_plateau", EnumCreatureType.MONSTER, EntityTypes.ILLUSIONER, 10, 1, 1);
|
|
+ }
|
|
}
|
|
|
|
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/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
index a6f90105f..b4f8cca53 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
@@ -158,6 +158,11 @@ public class PurpurConfig {
|
|
giantsHaveAI = getBoolean("settings.mobs.giant.have-ai", giantsHaveAI);
|
|
}
|
|
|
|
+ public static boolean illusionersNaturallySpawn = true;
|
|
+ private static void illusionersSettings() {
|
|
+ illusionersNaturallySpawn = getBoolean("settings.mobs.illusioner.naturally-spawn", illusionersNaturallySpawn);
|
|
+ }
|
|
+
|
|
public static boolean ironGolemSwims = true;
|
|
private static void ironGolemSettings() {
|
|
ironGolemSwims = getBoolean("settings.mobs.iron_golem.swims", ironGolemSwims);
|
|
--
|
|
2.20.1
|
|
|