mirror of https://github.com/YatopiaMC/Yatopia.git
84 lines
4.2 KiB
Diff
84 lines
4.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sun, 12 Apr 2020 13:19:34 -0500
|
|
Subject: [PATCH] Chickens can retaliate
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/EntityChicken.java b/src/main/java/net/minecraft/world/entity/animal/EntityChicken.java
|
|
index cd6fb8efb20a2d32de59d479b1dbf5ee69d5df37..600d6ebdf554dbaa8ca46a22a12d8b4e3255d987 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/EntityChicken.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/EntityChicken.java
|
|
@@ -20,10 +20,12 @@ import net.minecraft.world.entity.ai.goal.PathfinderGoalBreed;
|
|
import net.minecraft.world.entity.ai.goal.PathfinderGoalFloat;
|
|
import net.minecraft.world.entity.ai.goal.PathfinderGoalFollowParent;
|
|
import net.minecraft.world.entity.ai.goal.PathfinderGoalLookAtPlayer;
|
|
+import net.minecraft.world.entity.ai.goal.PathfinderGoalMeleeAttack;
|
|
import net.minecraft.world.entity.ai.goal.PathfinderGoalPanic;
|
|
import net.minecraft.world.entity.ai.goal.PathfinderGoalRandomLookaround;
|
|
import net.minecraft.world.entity.ai.goal.PathfinderGoalRandomStrollLand;
|
|
import net.minecraft.world.entity.ai.goal.PathfinderGoalTempt;
|
|
+import net.minecraft.world.entity.ai.goal.target.PathfinderGoalHurtByTarget;
|
|
import net.minecraft.world.entity.player.EntityHuman;
|
|
import net.minecraft.world.item.ItemStack;
|
|
import net.minecraft.world.item.Items;
|
|
@@ -51,16 +53,33 @@ public class EntityChicken extends EntityAnimal {
|
|
this.a(PathType.WATER, 0.0F);
|
|
}
|
|
|
|
+ // Purpur start
|
|
+ @Override
|
|
+ protected void initAttributes() {
|
|
+ if (world.purpurConfig.chickenRetaliate) {
|
|
+ this.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue(2.0D);
|
|
+ }
|
|
+ }
|
|
+ // Purpur end
|
|
+
|
|
@Override
|
|
protected void initPathfinder() {
|
|
this.goalSelector.a(0, new PathfinderGoalFloat(this));
|
|
- this.goalSelector.a(1, new PathfinderGoalPanic(this, 1.4D));
|
|
+ //this.goalSelector.a(1, new PathfinderGoalPanic(this, 1.4D)); // Purpur - moved down
|
|
this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
|
|
this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.0D, false, EntityChicken.bv));
|
|
this.goalSelector.a(4, new PathfinderGoalFollowParent(this, 1.1D));
|
|
this.goalSelector.a(5, new PathfinderGoalRandomStrollLand(this, 1.0D));
|
|
this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
|
|
this.goalSelector.a(7, new PathfinderGoalRandomLookaround(this));
|
|
+ // Purpur start
|
|
+ if (world.purpurConfig.chickenRetaliate) {
|
|
+ this.goalSelector.a(1, new PathfinderGoalMeleeAttack(this, 1.0D, false));
|
|
+ this.targetSelector.a(1, new PathfinderGoalHurtByTarget(this));
|
|
+ } else {
|
|
+ this.goalSelector.a(1, new PathfinderGoalPanic(this, 1.4D));
|
|
+ }
|
|
+ // Purpur end
|
|
}
|
|
|
|
@Override
|
|
@@ -69,7 +88,7 @@ public class EntityChicken extends EntityAnimal {
|
|
}
|
|
|
|
public static AttributeProvider.Builder eK() {
|
|
- return EntityInsentient.p().a(GenericAttributes.MAX_HEALTH, 4.0D).a(GenericAttributes.MOVEMENT_SPEED, 0.25D);
|
|
+ return EntityInsentient.p().a(GenericAttributes.MAX_HEALTH, 4.0D).a(GenericAttributes.MOVEMENT_SPEED, 0.25D).a(GenericAttributes.ATTACK_DAMAGE, 0.0D); // Purpur
|
|
}
|
|
|
|
@Override
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index fa43c015976aabaae8843983976c9c939a49016f..78218f2d59203b8f2b286fd09b3f6bdebb47565c 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -113,6 +113,11 @@ public class PurpurWorldConfig {
|
|
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
|
|
}
|
|
|
|
+ public boolean chickenRetaliate = false;
|
|
+ private void chickenSettings() {
|
|
+ chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
|
|
+ }
|
|
+
|
|
public double creeperChargedChance = 0.0D;
|
|
private void creeperSettings() {
|
|
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
|