Change some default config options to match vanilla behaviors

This commit is contained in:
William Blake Galbreath
2019-07-28 06:35:15 -05:00
parent 6b2be588df
commit b9c7dca7b8
17 changed files with 180 additions and 151 deletions

View File

@@ -1,4 +1,4 @@
From 1dd837a707fbdd7d6a1fcbbb863c851464a75331 Mon Sep 17 00:00:00 2001
From be1741ea568ce4b0ad7c28e96ab5afc191544b32 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 22 Jul 2019 17:32:17 -0500
Subject: [PATCH] Implement configurable search radius for villagers to spawn
@@ -10,19 +10,19 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
2 files changed, 8 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 976473a678..7bc0c2f861 100644
index 976473a678..0800788e5b 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -886,6 +886,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@Nullable
private EntityIronGolem eG() {
+ if (world.a(EntityIronGolem.class, getBoundingBox().grow(world.purpurConfig.radiusVillagerIronGolemSpawns)).size() > world.purpurConfig.limitVillagerIronGolemSpawns) return null; // Purpur
+ if (world.purpurConfig.radiusVillagerIronGolemSpawns > 0 && world.a(EntityIronGolem.class, getBoundingBox().grow(world.purpurConfig.radiusVillagerIronGolemSpawns)).size() > world.purpurConfig.limitVillagerIronGolemSpawns) return null; // Purpur
BlockPosition blockposition = new BlockPosition(this);
int i = 0;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e3fe4ed5f0..88a7e9ec6e 100644
index e3fe4ed5f0..4dfecc4a1b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -133,4 +133,11 @@ public class PurpurWorldConfig {
@@ -30,7 +30,7 @@ index e3fe4ed5f0..88a7e9ec6e 100644
limitPillagerOutpostSpawns = getInt("limit-pillager-outpost-spawns", limitPillagerOutpostSpawns);
}
+
+ public int radiusVillagerIronGolemSpawns = 64;
+ public int radiusVillagerIronGolemSpawns = 0;
+ public int limitVillagerIronGolemSpawns = 5;
+ private void radiusVillagerIronGolemSpawns() {
+ radiusVillagerIronGolemSpawns = getInt("radius-villager-iron-golem-spawns", radiusVillagerIronGolemSpawns);