Fix the retaliation

patches/server/0111-Chickens-can-retaliate.patch

@@ -1,15 +1,15 @@
-From 819efa37928d0ef019e6374e5834eeba82860ce5 Mon Sep 17 00:00:00 2001
+From dcddff3c4d31806884dadf1bd5214c7fd71664ef 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
 
 ---
- src/main/java/net/minecraft/server/EntityChicken.java | 11 ++++++++++-
- src/main/java/net/pl3x/purpur/PurpurWorldConfig.java  |  2 ++
- 2 files changed, 12 insertions(+), 1 deletion(-)
+ .../java/net/minecraft/server/EntityChicken.java   | 14 +++++++++++++-
+ .../java/net/pl3x/purpur/PurpurWorldConfig.java    |  2 ++
+ 2 files changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index 5505b7ee94..b8ea9b3260 100644
+index 5505b7ee94..1c9b0ce61b 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
 @@ -38,13 +38,22 @@ public class EntityChicken extends EntityAnimal {
@@ -35,12 +35,22 @@ index 5505b7ee94..b8ea9b3260 100644
 +        // Purpur end
      }
  
+     @Override
+@@ -57,6 +66,9 @@ public class EntityChicken extends EntityAnimal {
+         super.initAttributes();
+         this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(4.0D);
+         this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(0.25D);
++        if (world.purpurConfig.chickenRetaliate) {
++            this.getAttributeMap().b(GenericAttributes.ATTACK_DAMAGE).setValue(2.0D);
++        }
+     }
+ 
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f1cca7219e..ef34a3482e 100644
+index 833b58f858..cb7bdf2dad 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -381,6 +381,7 @@ public class PurpurWorldConfig {
+@@ -361,6 +361,7 @@ public class PurpurWorldConfig {
      public boolean chickenDontLayEggsWhenRidden = false;
      public int chickenEggsHatchWhenDespawnedMax = 0;
      public int chickenEggsHatchWhenDespawnedRange = 10;
@@ -48,7 +58,7 @@ index f1cca7219e..ef34a3482e 100644
      private void chickenSettings() {
          chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
          chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
-@@ -388,6 +389,7 @@ public class PurpurWorldConfig {
+@@ -368,6 +369,7 @@ public class PurpurWorldConfig {
          chickenDontLayEggsWhenRidden = getBoolean("mobs.chicken.dont-lay-eggs-when-ridden", chickenDontLayEggsWhenRidden);
          chickenEggsHatchWhenDespawnedMax = getInt("mobs.chicken.eggs-hatch-when-despawned.max", chickenEggsHatchWhenDespawnedMax);
          chickenEggsHatchWhenDespawnedRange = getInt("mobs.chicken.eggs-hatch-when-despawned.range", chickenEggsHatchWhenDespawnedRange);

patches/server/0112-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch

@@ -1,4 +1,4 @@
-From ab235395d56c2b8ae83599445292048d56a53f4a Mon Sep 17 00:00:00 2001
+From d73313c8885078fa9587512f8d951baac56558c8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 21 Feb 2020 17:04:51 -0600
 Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter

patches/server/0113-MC-168772-Fix-Add-turtle-egg-block-options.patch

@@ -1,4 +1,4 @@
-From c94ced1b3813a118ca16c31c494f0e96bb443981 Mon Sep 17 00:00:00 2001
+From 72cd246994378bfeed237d33367b59267a9da267 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 22:15:46 -0500
 Subject: [PATCH] MC-168772 Fix - Add turtle egg block options
@@ -38,7 +38,7 @@ index cb36334e41..aa83ef1699 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 833b58f858..46c6742da8 100644
+index cb7bdf2dad..c6b436c1f3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -191,6 +191,15 @@ public class PurpurWorldConfig {

patches/server/0114-MC-4-Fix-Item-position-desync.patch

@@ -1,4 +1,4 @@
-From 371180c7bd03220b71c7d8f260ad63677513521f Mon Sep 17 00:00:00 2001
+From e9b38ffb7e164bd0afb0dfe8d4fd86c8b10beb90 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 21:12:58 -0500
 Subject: [PATCH] MC-4 Fix - Item position desync

patches/server/0115-MC-56653-Fix-pig-zombies-aggro.patch

@@ -1,4 +1,4 @@
-From 3e90adfb892fb2d30a5a6514a072d5a7f26f3653 Mon Sep 17 00:00:00 2001
+From 2f815445c62c46d625d38d620c0a9cab82f579ac Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 9 Jul 2019 20:56:47 -0500
 Subject: [PATCH] MC-56653 Fix - pig zombies aggro
@@ -43,10 +43,10 @@ index 90bf12c735..c78876fc42 100644
  
          public PathfinderGoalAnger(EntityPigZombie entitypigzombie) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 46c6742da8..b844b93d77 100644
+index c6b436c1f3..e46a9fd9be 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1003,6 +1003,7 @@ public class PurpurWorldConfig {
+@@ -1005,6 +1005,7 @@ public class PurpurWorldConfig {
      public boolean zombiePigmanJockeyOnlyBaby = true;
      public double zombiePigmanJockeyChance = 0.05D;
      public boolean zombiePigmanJockeyTryExistingChickens = true;
@@ -54,7 +54,7 @@ index 46c6742da8..b844b93d77 100644
      private void zombiePigmanSettings() {
          zombiePigmanRidable = getBoolean("mobs.zombie_pigman.ridable", zombiePigmanRidable);
          zombiePigmanRidableInWater = getBoolean("mobs.zombie_pigman.ridable-in-water", zombiePigmanRidableInWater);
-@@ -1010,6 +1011,7 @@ public class PurpurWorldConfig {
+@@ -1012,6 +1013,7 @@ public class PurpurWorldConfig {
          zombiePigmanJockeyOnlyBaby = getBoolean("mobs.zombie_pigman.jockey.only-babies", zombiePigmanJockeyOnlyBaby);
          zombiePigmanJockeyChance = getDouble("mobs.zombie_pigman.jockey.chance", zombiePigmanJockeyChance);
          zombiePigmanJockeyTryExistingChickens = getBoolean("mobs.zombie_pigman.jockey.try-existing-chickens", zombiePigmanJockeyTryExistingChickens);

patches/server/0116-EMC-MonsterEggSpawn-Event.patch

@@ -1,4 +1,4 @@
-From 38ed9f144c5f3a2708c90cf6d39c4239f25ce82c Mon Sep 17 00:00:00 2001
+From 31513ff7e94bbfa1caef3894f7d0c73a78f07e91 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 20 Jul 2013 22:40:56 -0400
 Subject: [PATCH] EMC - MonsterEggSpawn Event

patches/server/0117-PaperPR-Add-BellRingEvent.patch

@@ -1,4 +1,4 @@
-From e77e28eb11bf9f6130204cfe37657236a0016721 Mon Sep 17 00:00:00 2001
+From c14c95dd0966ac032112ccfb1f5c5ddd33c42d6f Mon Sep 17 00:00:00 2001
 From: Eearslya Sleiarion <eearslya@gmail.com>
 Date: Mon, 24 Jun 2019 21:27:32 -0700
 Subject: [PATCH] PaperPR - Add BellRingEvent

patches/server/0118-PaperPR-Per-World-Spawn-limits.patch

@@ -1,4 +1,4 @@
-From fbb2cbda6e3695eb4c43f498934da285239fa2b6 Mon Sep 17 00:00:00 2001
+From 872ceab741f0e42341a81dd926b476c65b808e73 Mon Sep 17 00:00:00 2001
 From: chase <chasewhip20@gmail.com>
 Date: Sun, 15 Mar 2020 18:32:22 -0600
 Subject: [PATCH] PaperPR - Per World Spawn limits
@@ -9,7 +9,7 @@ Subject: [PATCH] PaperPR - Per World Spawn limits
  2 files changed, 18 insertions(+)
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b844b93d77..f1cca7219e 100644
+index e46a9fd9be..ef34a3482e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -307,6 +307,17 @@ public class PurpurWorldConfig {

patches/server/0119-Tuinity-Delay-chunk-unloads.patch

@@ -1,4 +1,4 @@
-From a1a3f45960afdad2059d354176839c28b10ddc0c Mon Sep 17 00:00:00 2001
+From b299e9c60855215ab0f2849fd643b2f4f98b4ab3 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 25 Oct 2019 02:11:30 -0700
 Subject: [PATCH] Tuinity - Delay chunk unloads

patches/server/0120-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch

@@ -1,4 +1,4 @@
-From 249a6ce53535798d8b0e0064a6f390f9dde36098 Mon Sep 17 00:00:00 2001
+From 1dc8af244d0a5138e53b3a2bcd9cf901e1edfbf6 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Thu, 26 Mar 2020 18:34:18 -0700
 Subject: [PATCH] Tuinity - Don't run entity collision code if not needed

patches/server/0121-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch

@@ -1,4 +1,4 @@
-From 53a11c80d9489ac8ef1f4c6e046e79ddda889c15 Mon Sep 17 00:00:00 2001
+From 721d5c59f4af48c0d087e14ef7a282fd753886e5 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Fri, 3 Apr 2020 02:21:13 -0700
 Subject: [PATCH] Tuinity - Always able to execute tasks on the main server

patches/server/0122-YAPFA-Disable-mojang-profiler.patch

@@ -1,4 +1,4 @@
-From 5a8b067c0a8214a4ab936b4cd8f73f1da1ad9ffe Mon Sep 17 00:00:00 2001
+From 9de07f09d0b0d02442fc5708bfc7ad0764058aac Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 5 Mar 2020 23:08:01 +0100
 Subject: [PATCH] YAPFA - Disable mojang profiler