Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 12:05:53 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-5968: Killer rabbits can't be set to the non-killer rabbit behavior

Browse Source
This commit is contained in:
md_5 2020-07-09 09:04:11 +10:00
parent 69fddc725b
commit 60f8a29d12
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nms-patches/EntityRabbit.patch
View File

@ -1,6 +1,6 @@
--- a/net/minecraft/server/EntityRabbit.java --- a/net/minecraft/server/EntityRabbit.java
+++ b/net/minecraft/server/EntityRabbit.java +++ b/net/minecraft/server/EntityRabbit.java
@@ -17,8 +17,14 @@ @@ -17,11 +17,17 @@
super(entitytypes, world); super(entitytypes, world);
this.bp = new EntityRabbit.ControllerJumpRabbit(this); this.bp = new EntityRabbit.ControllerJumpRabbit(this);
this.moveController = new EntityRabbit.ControllerMoveRabbit(this); this.moveController = new EntityRabbit.ControllerMoveRabbit(this);
@ -14,7 +14,11 @@
+ // CraftBukkit end + // CraftBukkit end
@Override @Override
protected void initPathfinder() { - protected void initPathfinder() {
+ public void initPathfinder() {
this.goalSelector.a(1, new PathfinderGoalFloat(this));
this.goalSelector.a(1, new EntityRabbit.PathfinderGoalRabbitPanic(this, 2.2D));
this.goalSelector.a(2, new PathfinderGoalBreed(this, 0.8D));
@@ -285,7 +291,7 @@ @@ -285,7 +291,7 @@
if (i == 99) { if (i == 99) {
this.getAttributeInstance(GenericAttributes.ARMOR).setValue(8.0D); this.getAttributeInstance(GenericAttributes.ARMOR).setValue(8.0D);

1
src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java
View File

@ -43,6 +43,7 @@ public class CraftRabbit extends CraftAnimals implements Rabbit {
World world = ((CraftWorld) this.getWorld()).getHandle(); World world = ((CraftWorld) this.getWorld()).getHandle();
entity.goalSelector = new PathfinderGoalSelector(world.getMethodProfilerSupplier()); entity.goalSelector = new PathfinderGoalSelector(world.getMethodProfilerSupplier());
entity.targetSelector = new PathfinderGoalSelector(world.getMethodProfilerSupplier()); entity.targetSelector = new PathfinderGoalSelector(world.getMethodProfilerSupplier());
entity.initPathfinder();
entity.initializePathFinderGoals(); entity.initializePathFinderGoals();
} }