Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 10:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move more options to per-world section (still more to come)

Browse Source
This commit is contained in:
William Blake Galbreath
2020-01-14 19:33:01 -06:00
parent bee0cc833b
commit a221240eef
35 changed files with 298 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
patches/server/0034-Add-chance-for-zombie-horse-natural-spawns.patch
View File

@@ -1,15 +1,15 @@
From 3aaa5a6281ff8a911e3f6623bfc8dba4e2990ef1 Mon Sep 17 00:00:00 2001
From 2a316cadda007eae32884eef898e21ec252771e3 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 +++++
.../net/pl3x/purpur/PurpurWorldConfig.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 8526a3fda1..a299fbf96a 100644
index 8526a3fda1..fbfe37ea0a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -549,12 +549,18 @@ public class WorldServer extends World {
@@ -24,7 +24,7 @@ index 8526a3fda1..a299fbf96a 100644
- 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) {
+ if (purpurConfig.zombieHorseSpawnChance > 0F && random.nextFloat() <= purpurConfig.zombieHorseSpawnChance) {
+ horse = EntityTypes.ZOMBIE_HORSE.a(this);
+ } else {
+ horse = EntityTypes.SKELETON_HORSE.a(this);
@@ -37,22 +37,20 @@ index 8526a3fda1..a299fbf96a 100644
}
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 5114296777..3389d626af 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);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c053aec937..993906ba42 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -118,4 +118,9 @@ public class PurpurWorldConfig {
private void enderDragonSettings() {
enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
}
+ 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);
+ public float zombieHorseSpawnChance = 0F;
+ private void zombieHorseSettings() {
+ zombieHorseSpawnChance = (float) getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
+ }
}
--
2.24.0