Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 19:37:35 +01:00
Code Issues Projects Releases Wiki Activity

Check Drowned for Villager Aggression Config (#1560)

Browse Source
This commit is contained in:
BillyGalbreath 2018-10-10 22:01:14 -05:00 committed by Daniel Ennis
parent 62efc6ab31
commit 950b62689f
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Spigot-Server-Patches/0387-Check-Drowned-for-Villager-Aggression-Config.patch Normal file
View File

@ -0,0 +1,36 @@
From 75011bcf6b7c641070398db3b49508dea71e87b5 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 aeb34568b..467c0c8a8 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