Fix spacebar charging a creeper explodes it too soon

This commit is contained in:
William Blake Galbreath
2019-12-21 15:39:06 -06:00
parent 2d0b0501a5
commit c4eb8206bc

View File

@@ -1,4 +1,4 @@
From eb9bf7c8e7ca877d3461bd56c6ade52c42f3a7c7 Mon Sep 17 00:00:00 2001
From 9bb3f884200ceea42b3044d6ccabe253b4baea30 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -575,10 +575,10 @@ index e1d0f0f38..dcff77d8d 100644
this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
if (net.pl3x.purpur.PurpurConfig.feedMushroomsToCows > 0) this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT, Blocks.RED_MUSHROOM.getItem(), Blocks.BROWN_MUSHROOM.getItem()), false)); else // Purpur
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
index 77ba92333..9bce3f771 100644
index 77ba92333..ebae46280 100644
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -21,11 +21,13 @@ public class EntityCreeper extends EntityMonster {
@@ -21,12 +21,14 @@ public class EntityCreeper extends EntityMonster {
public EntityCreeper(EntityTypes<? extends EntityCreeper> entitytypes, World world) {
super(entitytypes, world);
@@ -588,10 +588,11 @@ index 77ba92333..9bce3f771 100644
@Override
protected void initPathfinder() {
this.goalSelector.a(1, new PathfinderGoalFloat(this));
+ this.goalSelector.a(1, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
this.goalSelector.a(2, new PathfinderGoalSwell(this));
+ this.goalSelector.a(3, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
this.goalSelector.a(3, new PathfinderGoalAvoidTarget<>(this, EntityOcelot.class, 6.0F, 1.0D, 1.2D));
this.goalSelector.a(3, new PathfinderGoalAvoidTarget<>(this, EntityCat.class, 6.0F, 1.0D, 1.2D));
this.goalSelector.a(4, new PathfinderGoalMeleeAttack(this, 1.0D, false));
@@ -277,4 +279,59 @@ public class EntityCreeper extends EntityMonster {
public void setCausedHeadDrop() {
++this.bA;