twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-31 20:33:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Prepare for 1.19 dev

Browse Source
This commit is contained in:
Nassim Jahnke
2022-06-07 18:52:56 +02:00
parent f34f678b20
commit 1148687a8d
1302 changed files with 120 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
patches/server/Make-water-animal-spawn-height-configurable.patch
View File

@@ -1,50 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Sat, 18 Dec 2021 08:26:55 +0100
Subject: [PATCH] Make water animal spawn height configurable
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
}
+ public Integer waterAnimalMaxSpawnHeight;
+ private void waterAnimalMaxSpawnHeight() {
+ String v = getString("wateranimal-spawn-height.maximum", "default");
+ try {
+ waterAnimalMaxSpawnHeight = Integer.parseInt(v);
+ } catch (NumberFormatException ignored) {
+ }
+ }
+
+ public Integer waterAnimalMinSpawnHeight;
+ private void waterAnimalMinSpawnHeight() {
+ String v = getString("wateranimal-spawn-height.minimum", "default");
+ try {
+ waterAnimalMinSpawnHeight = Integer.parseInt(v);
+ } catch (NumberFormatException ignored) {
+ }
+ }
+
public int containerUpdateTickRate;
private void containerUpdateTickRate() {
containerUpdateTickRate = getInt("container-update-tick-rate", 1);
diff --git a/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java b/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java
+++ b/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java
@@ -0,0 +0,0 @@ public abstract class WaterAnimal extends PathfinderMob {
public static boolean checkSurfaceWaterAnimalSpawnRules(EntityType<? extends WaterAnimal> type, LevelAccessor world, MobSpawnType reason, BlockPos pos, Random random) {
int i = world.getSeaLevel();
int j = i - 13;
+ // Paper start
+ i = world.getMinecraftWorld().paperConfig.waterAnimalMaxSpawnHeight != null ? world.getMinecraftWorld().paperConfig.waterAnimalMaxSpawnHeight : i;
+ j = world.getMinecraftWorld().paperConfig.waterAnimalMinSpawnHeight != null ? world.getMinecraftWorld().paperConfig.waterAnimalMinSpawnHeight : j;
+ // Paper end
return pos.getY() >= j && pos.getY() <= i && world.getFluidState(pos.below()).is(FluidTags.WATER) && world.getBlockState(pos.above()).is(Blocks.WATER);
}
}