mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
3984c3706f
Upstream has released updates that appears to apply and compile correctly Paper Changes: 3cd952e2 Yank 0417-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch c47cf32c Restore 0129-Optimize-World.isLoaded-BlockPosition-Z.patch 16071c7e Remove applied oversized chunks patch cd499c92 Restore Use-getChunkIfLoadedImmediately-in-places.patch 7986f57e Bring back Reduce-sync-loads.patch (#2761) 9e58f226 Address gen concurrency issue causing crashes (Fixes #2746)
59 lines
3.4 KiB
Diff
59 lines
3.4 KiB
Diff
From 8274817a5714b4cf69bd350bb538be96e3b18d8f Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sun, 7 Jul 2019 19:52:16 -0500
|
|
Subject: [PATCH] Add chance for zombie horse natural spawns
|
|
|
|
---
|
|
.../java/net/minecraft/server/WorldServer.java | 18 ++++++++++++------
|
|
.../java/net/pl3x/purpur/PurpurConfig.java | 5 +++++
|
|
2 files changed, 17 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index 3739a95c5a..79fa88549a 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -531,12 +531,18 @@ public class WorldServer extends World {
|
|
boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
|
|
|
|
if (flag1) {
|
|
- EntityHorseSkeleton entityhorseskeleton = (EntityHorseSkeleton) EntityTypes.SKELETON_HORSE.a((World) this);
|
|
-
|
|
- entityhorseskeleton.r(true);
|
|
- entityhorseskeleton.setAgeRaw(0);
|
|
- entityhorseskeleton.setPosition((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
|
|
- this.addEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
|
|
+ // Purpur start
|
|
+ EntityHorseAbstract horse;
|
|
+ if (net.pl3x.purpur.PurpurConfig.zombieHorseSpawnChance > 0F && random.nextFloat() <= net.pl3x.purpur.PurpurConfig.zombieHorseSpawnChance) {
|
|
+ horse = EntityTypes.ZOMBIE_HORSE.a(this);
|
|
+ } else {
|
|
+ horse = EntityTypes.SKELETON_HORSE.a(this);
|
|
+ ((EntityHorseSkeleton) horse).r(true);
|
|
+ }
|
|
+ horse.setAgeRaw(0);
|
|
+ horse.setPosition((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
|
|
+ this.addEntity(horse, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
|
|
+ // Purpur end
|
|
}
|
|
|
|
this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
index 882f7711c7..f0ed3c9749 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
@@ -207,6 +207,11 @@ public class PurpurConfig {
|
|
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
|
|
}
|
|
|
|
+ public static float zombieHorseSpawnChance = 0F;
|
|
+ private static void zombieHorseSettings() {
|
|
+ zombieHorseSpawnChance = (float) getDouble("settings.mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
|
|
+ }
|
|
+
|
|
public static boolean largeEnderChests = true;
|
|
private static void largeEnderChests() {
|
|
largeEnderChests = getBoolean("settings.large-ender-chests", largeEnderChests);
|
|
--
|
|
2.24.0.rc1
|
|
|