mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-03 01:10:37 +01:00
684bd2adbc
--- work/Bukkit Submodule work/Bukkit 9a793cce8..0c1d258bb: > Make PigZapEvent extend EntityTransformEvent --- work/CraftBukkit Submodule work/CraftBukkit ee6684bba..6a398ac44: > SPIGOT-4511: Trident doesn't lose durability > Tweak outdated windows
37 lines
1.9 KiB
Diff
37 lines
1.9 KiB
Diff
From 339773e609c502e87439121628825c9b02857833 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Wed, 10 Oct 2018 21:22:44 -0500
|
|
Subject: [PATCH] Check Drowned for Villager Aggression Config
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
|
|
index b4500eead..512c22df9 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityDrowned.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityDrowned.java
|
|
@@ -27,7 +27,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
|
|
this.goalSelector.a(7, new PathfinderGoalRandomStroll(this, 1.0D));
|
|
this.targetSelector.a(1, new PathfinderGoalHurtByTarget(this, true, new Class[]{EntityDrowned.class}));
|
|
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget(this, EntityHuman.class, 10, true, false, new EntityDrowned.b(this)));
|
|
- this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget(this, EntityVillager.class, false));
|
|
+ if ( world.spigotConfig.zombieAggressiveTowardsVillager ) this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget(this, EntityVillager.class, false)); // Paper
|
|
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget(this, EntityIronGolem.class, true));
|
|
this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget(this, EntityTurtle.class, 10, true, false, EntityTurtle.bC));
|
|
}
|
|
@@ -231,9 +231,10 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
|
|
return this.a.f(entityhuman);
|
|
}
|
|
|
|
- // $FF: synthetic method
|
|
- public boolean test(@Nullable Object object) {
|
|
- return this.a((EntityHuman)object);
|
|
+ // Paper start - decompile error
|
|
+ public boolean test(@Nullable EntityHuman entityhuman) {
|
|
+ return this.a(entityhuman);
|
|
+ // Paper end
|
|
}
|
|
}
|
|
|
|
--
|
|
2.19.1
|
|
|