From 62aabe5c51c5328e6b171d1b7dba408ac89beb5c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 10 Jul 2019 23:06:16 -0500 Subject: [PATCH] Merge giant strength change into giant ai patch --- ...e-giants-naturally-spawn-and-have-AI.patch | 18 +++++++------ ...ke-giants-only-as-strong-as-ravagers.patch | 25 ------------------- 2 files changed, 11 insertions(+), 32 deletions(-) delete mode 100644 patches/server/0049-Make-giants-only-as-strong-as-ravagers.patch diff --git a/patches/server/0013-Make-giants-naturally-spawn-and-have-AI.patch b/patches/server/0013-Make-giants-naturally-spawn-and-have-AI.patch index 3e5453403..0c8bcdb89 100644 --- a/patches/server/0013-Make-giants-naturally-spawn-and-have-AI.patch +++ b/patches/server/0013-Make-giants-naturally-spawn-and-have-AI.patch @@ -1,14 +1,14 @@ -From 458fda51cacad3f29fee4f83569abc21f4db2ef3 Mon Sep 17 00:00:00 2001 +From 7d7ad4d46769d70175c9b069b31524b787683cf0 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 12 May 2019 00:43:12 -0500 Subject: [PATCH] Make giants naturally spawn and have AI --- .../java/net/minecraft/server/BiomeBase.java | 1 + - .../java/net/minecraft/server/Biomes.java | 25 +++++++++++++++++ - .../minecraft/server/EntityGiantZombie.java | 28 ++++++++++++++++++- + .../java/net/minecraft/server/Biomes.java | 25 ++++++++++++++++ + .../minecraft/server/EntityGiantZombie.java | 30 +++++++++++++++++-- .../java/net/pl3x/purpur/PurpurConfig.java | 7 +++++ - 4 files changed, 60 insertions(+), 1 deletion(-) + 4 files changed, 61 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java index 72eb669c5..f1500f7a0 100644 @@ -58,11 +58,15 @@ index f4698a680..3f7f7a2de 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java -index b7e2022b1..3af376079 100644 +index b7e2022b1..e69e7a456 100644 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java -@@ -24,8 +24,34 @@ public class EntityGiantZombie extends EntityMonster { - this.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue(50.0D); +@@ -21,11 +21,37 @@ public class EntityGiantZombie extends EntityMonster { + super.initAttributes(); + this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(100.0D); + this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(0.5D); +- this.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue(50.0D); ++ this.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue(12.0D); // Purpur - match ravager damage } + // Purpur start diff --git a/patches/server/0049-Make-giants-only-as-strong-as-ravagers.patch b/patches/server/0049-Make-giants-only-as-strong-as-ravagers.patch deleted file mode 100644 index 4609565f8..000000000 --- a/patches/server/0049-Make-giants-only-as-strong-as-ravagers.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 163171a8e0559962f2c63bfa96b7d677aa0e505a Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Wed, 10 Jul 2019 20:57:08 -0500 -Subject: [PATCH] Make giants only as strong as ravagers - ---- - src/main/java/net/minecraft/server/EntityGiantZombie.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java -index 3af376079..e69e7a456 100644 ---- a/src/main/java/net/minecraft/server/EntityGiantZombie.java -+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java -@@ -21,7 +21,7 @@ public class EntityGiantZombie extends EntityMonster { - super.initAttributes(); - this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(100.0D); - this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(0.5D); -- this.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue(50.0D); -+ this.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue(12.0D); // Purpur - match ravager damage - } - - // Purpur start --- -2.20.1 -