mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-28 22:47:53 +02:00
928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
25 lines
1.5 KiB
Diff
25 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Fri, 15 Apr 2022 17:09:28 -0700
|
|
Subject: [PATCH] Fix slime spawners not spawning outside slime chunks
|
|
|
|
Fixes MC-50647 by just checking if the spawn type is a SPAWNER
|
|
and then bypassing the spawn check logic if on slimes if it is.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
|
index fa79316adb11ab39cf921475e12a50058fd82a87..7e85ad7ba31bbb32ea1e1dff5d1c83e7ce68b4b3 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
|
@@ -320,6 +320,11 @@ public class Slime extends Mob implements Enemy {
|
|
|
|
public static boolean checkSlimeSpawnRules(EntityType<Slime> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
|
|
if (world.getDifficulty() != Difficulty.PEACEFUL) {
|
|
+ // Paper start - fix slime spawners; Fixes MC-50647
|
|
+ if (spawnReason == MobSpawnType.SPAWNER) {
|
|
+ return random.nextInt(10) == 0;
|
|
+ }
|
|
+ // Paper end
|
|
// Paper start - Replace rules for Height in Swamp Biome
|
|
final double maxHeightSwamp = world.getMinecraftWorld().paperConfig().entities.spawning.slimeSpawnHeight.surfaceBiome.maximum;
|
|
final double minHeightSwamp = world.getMinecraftWorld().paperConfig().entities.spawning.slimeSpawnHeight.surfaceBiome.minimum;
|