From 8abc38c01ddd6cdee7e008bfb0c11a930984f745 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Mar 2020 21:49:37 -0500 Subject: [PATCH] Fix bug in jockey patch --- patches/server/0115-Configurable-jockey-options.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/server/0115-Configurable-jockey-options.patch b/patches/server/0115-Configurable-jockey-options.patch index b55eb1346..129ef1cb9 100644 --- a/patches/server/0115-Configurable-jockey-options.patch +++ b/patches/server/0115-Configurable-jockey-options.patch @@ -1,4 +1,4 @@ -From d5aeec1dd7fca371c66e149c03477e2c3337044d Mon Sep 17 00:00:00 2001 +From f3b011a29373ae1d027bcc23f1c376a1fa20fe3d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Mar 2020 21:39:32 -0500 Subject: [PATCH] Configurable jockey options @@ -65,7 +65,7 @@ index 227fff3f1d..c78876fc42 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 95ae6f3494..e90a93eaa6 100644 +index 95ae6f3494..e60e4adc1d 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -104,10 +104,10 @@ index 95ae6f3494..e90a93eaa6 100644 - if ((double) generatoraccess.getRandom().nextFloat() < 0.05D) { - List list = generatoraccess.a(EntityChicken.class, this.getBoundingBox().grow(5.0D, 3.0D, 5.0D), IEntitySelector.c); + // Purpur start -+ if (!world.purpurConfig.zombieJockeyOnlyBaby || entityzombie_groupdatazombie.isBaby()) { ++ if (!jockeyOnlyBaby() || entityzombie_groupdatazombie.isBaby()) { + this.setBaby(entityzombie_groupdatazombie.isBaby()); -+ if ((double) generatoraccess.getRandom().nextFloat() < world.purpurConfig.zombieJockeyChance) { -+ List list = world.purpurConfig.zombieJockeyTryExistingChickens ? generatoraccess.a(EntityChicken.class, this.getBoundingBox().grow(5.0D, 3.0D, 5.0D), IEntitySelector.c) : Collections.emptyList(); ++ if ((double) generatoraccess.getRandom().nextFloat() < jockeyChance()) { ++ List list = jockeyTryExistingChickens() ? generatoraccess.a(EntityChicken.class, this.getBoundingBox().grow(5.0D, 3.0D, 5.0D), IEntitySelector.c) : Collections.emptyList(); + // Purpur end if (!list.isEmpty()) {