Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.16.1

Browse Source
This commit is contained in:
William Blake Galbreath
2020-06-28 10:10:31 -05:00
parent 3fd5ba2813
commit 1a46c4bc6b
181 changed files with 3159 additions and 26430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
patches/server/0045-Chickens-can-retaliate.patch Normal file
View File

@@ -0,0 +1,68 @@
From c4779abb7e9a4c114128b2c3358b6f88f7fc3578 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
---
.../net/minecraft/server/EntityChicken.java | 21 ++++++++++++++++++-
.../net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
index c6ee92343..ae1f4cb49 100644
--- a/src/main/java/net/minecraft/server/EntityChicken.java
+++ b/src/main/java/net/minecraft/server/EntityChicken.java
@@ -20,14 +20,33 @@ public class EntityChicken extends EntityAnimal {
@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.bC));
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
+ }
+
+ // Purpur start
+ @Override
+ protected void initAttributes(World world) {
+ if (world != null) {
+ if (world.purpurConfig.chickenRetaliate) {
+ this.getAttributeMap().getAttribute(GenericAttributes.ATTACK_DAMAGE).setValue(2.0D);
+ }
+ }
}
+ // Purpur end
@Override
protected float b(EntityPose entitypose, EntitySize entitysize) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 12e263d21..77cdd94d5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -96,6 +96,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);
--
2.26.2