Big dripleaf tilt delay

This commit is contained in:
William Blake Galbreath
2021-07-16 23:01:23 -05:00
parent d43b5ff644
commit 27211924b2
155 changed files with 568 additions and 515 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index f0c4a16d9b95bc64c1c43154b2bff9a36885ec77..bfbcdaa117fd8860aa3e287a7e311f2f3bb42281 100644
index 5316b5e9bfe57caed88a3ff38715e67ffd59df33..7944a33cf36878c9e4853637bfb9cba22ba8bc4d 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -83,6 +83,7 @@ import net.minecraft.world.entity.MobCategory;
@@ -94,10 +94,10 @@ index f8ede3588bfda9a7d4d5807311a3e9c2651fd0a3..56967cef0f184def046935e20148574f
if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
blockposition1 = blockposition2;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 48bf586acd5968819bdbbf8f224bb1dc9b47a8f5..8c41d2b2729593a807efb5a9d10b13e9f7dcbd28 100644
index dc7bba566ec321f645848c734ab00a627e85bcb8..2cb1d795b11203c2f5cd85d7ff049faeac7ac71a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -71,6 +71,12 @@ public class PurpurWorldConfig {
@@ -72,6 +72,12 @@ public class PurpurWorldConfig {
return PurpurConfig.config.getBoolean("world-settings." + worldName + "." + path, PurpurConfig.config.getBoolean("world-settings.default." + path));
}
@@ -110,7 +110,7 @@ index 48bf586acd5968819bdbbf8f224bb1dc9b47a8f5..8c41d2b2729593a807efb5a9d10b13e9
private double getDouble(String path, double def) {
PurpurConfig.config.addDefault("world-settings.default." + path, def);
return PurpurConfig.config.getDouble("world-settings." + worldName + "." + path, PurpurConfig.config.getDouble("world-settings.default." + path));
@@ -220,6 +226,21 @@ public class PurpurWorldConfig {
@@ -221,6 +227,21 @@ public class PurpurWorldConfig {
}
}