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

Move timings changes to its own patch

Browse Source
This commit is contained in:
William Blake Galbreath
2020-02-18 21:22:51 -06:00
parent 3df05bd5aa
commit 76b5d1cdcf
127 changed files with 687 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
patches/server/0092-Add-option-for-zombie-villager-transformation-chance.patch Normal file
View File

@@ -0,0 +1,48 @@
From a37f0da70ab9bf1e803f47c1c0c5a3b80da5ec3c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 19 Dec 2019 16:59:46 -0600
Subject: [PATCH] Add option for zombie villager transformation chance
---
src/main/java/net/minecraft/server/EntityZombie.java | 6 ++++--
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 1e60cc399b..889e19139c 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -474,8 +474,10 @@ public class EntityZombie extends EntityMonster {
@Override
public void b(EntityLiving entityliving) {
super.b(entityliving);
- if ((this.world.getDifficulty() == EnumDifficulty.NORMAL || this.world.getDifficulty() == EnumDifficulty.HARD) && entityliving instanceof EntityVillager) {
- if (this.world.getDifficulty() != EnumDifficulty.HARD && this.random.nextBoolean()) {
+ // Purpur start
+ if (entityliving instanceof EntityVillager) {
+ if (world.purpurConfig.zombieVillagerTransformationChance <= 0.0D || random.nextDouble() > world.purpurConfig.zombieVillagerTransformationChance) {
+ // Purpur end
return;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6b422f8d83..3caef698ce 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -863,11 +863,13 @@ public class PurpurWorldConfig {
public boolean zombieRidableInWater = false;
public boolean zombieRequireShiftToMount = true;
public boolean zombieTargetTurtleEggs = true;
+ public double zombieVillagerTransformationChance = 0.5D;
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
zombieRequireShiftToMount = getBoolean("mobs.zombie.require-shift-to-mount", zombieRequireShiftToMount);
zombieTargetTurtleEggs = getBoolean("mobs.zombie.target-turtle-eggs", zombieTargetTurtleEggs);
+ zombieVillagerTransformationChance = getDouble("mobs.zombie.transform-to-villager-chance", zombieVillagerTransformationChance);
}
public boolean zombieHorseCanSwim = false;
--
2.24.0