From 2459033549205c330a3538ddeabdedc141be52b9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 2 Oct 2020 12:39:58 -0500 Subject: [PATCH] Rebuild patches --- ...sable-zombie-aggressiveness-towards-.patch | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/patches/server/0130-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0130-Add-option-to-disable-zombie-aggressiveness-towards-.patch index 8ae1ec573..ea5d75693 100644 --- a/patches/server/0130-Add-option-to-disable-zombie-aggressiveness-towards-.patch +++ b/patches/server/0130-Add-option-to-disable-zombie-aggressiveness-towards-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -index 89b56de75..ded483ace 100644 +index 89b56de756..ded483ace0 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java @@ -131,6 +131,10 @@ public class MobGoalHelper { @@ -21,15 +21,16 @@ index 89b56de75..ded483ace 100644 ignored.add("selector_1"); ignored.add("selector_2"); diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 8aa53c617..1b75a2ff5 100644 +index 8aa53c617b..99f615c645 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java -@@ -58,7 +58,16 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { +@@ -58,7 +58,18 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { this.goalSelector.a(7, new PathfinderGoalRandomStroll(this, 1.0D)); this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[]{EntityDrowned.class})).a(EntityPigZombie.class)); this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, 10, true, false, this::i)); - if ( world.spigotConfig.zombieAggressiveTowardsVillager ) this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)); // Paper -+ if ( world.spigotConfig.zombieAggressiveTowardsVillager ) this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget(this, EntityVillagerAbstract.class, false) { // Spigot // Purpur start ++ // Purpur start ++ if ( world.spigotConfig.zombieAggressiveTowardsVillager ) this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget(this, EntityVillagerAbstract.class, false) { // Spigot + @Override + public boolean a() { + return (world.purpurConfig.zombieAggressiveTowardsVillagerWhenLagging || !world.getMinecraftServer().server.isLagging()) && super.a(); @@ -38,29 +39,22 @@ index 8aa53c617..1b75a2ff5 100644 + public boolean b() { + return (world.purpurConfig.zombieAggressiveTowardsVillagerWhenLagging || !world.getMinecraftServer().server.isLagging()) && super.b(); + } -+ }); // Purpur end ++ }); ++ // Purpur end this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true)); this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo)); } diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index d08747c66..bcb5ddcaa 100644 +index d08747c66a..7b2a66d6d3 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java -@@ -11,7 +11,7 @@ import java.util.function.Predicate; - import javax.annotation.Nullable; - - // CraftBukkit start --import org.bukkit.craftbukkit.event.CraftEventFactory; -+import org.bukkit.entity.LivingEntity; - import org.bukkit.entity.Zombie; - import org.bukkit.event.entity.CreatureSpawnEvent; - import org.bukkit.event.entity.EntityCombustByEntityEvent; -@@ -85,7 +85,16 @@ public class EntityZombie extends EntityMonster { +@@ -85,7 +85,18 @@ public class EntityZombie extends EntityMonster { this.goalSelector.a(7, new PathfinderGoalRandomStrollLand(this, 1.0D)); this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[0])).a(EntityPigZombie.class)); this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); - if ( world.spigotConfig.zombieAggressiveTowardsVillager ) this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)); // Spigot -+ if ( world.spigotConfig.zombieAggressiveTowardsVillager ) this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget(this, EntityVillagerAbstract.class, false) { // Spigot // Purpur start ++ // Purpur start ++ if ( world.spigotConfig.zombieAggressiveTowardsVillager ) this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget(this, EntityVillagerAbstract.class, false) { // Spigot + @Override + public boolean a() { + return (world.purpurConfig.zombieAggressiveTowardsVillagerWhenLagging || !world.getMinecraftServer().server.isLagging()) && super.a(); @@ -69,12 +63,13 @@ index d08747c66..bcb5ddcaa 100644 + public boolean b() { + return (world.purpurConfig.zombieAggressiveTowardsVillagerWhenLagging || !world.getMinecraftServer().server.isLagging()) && super.b(); + } -+ }); // Purpur end ++ }); ++ // Purpur end this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true)); this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo)); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 67b899667..d0fe5f751 100644 +index b865beceb0..caef18518b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -998,12 +998,14 @@ public class PurpurWorldConfig {