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

Merge giant strength change into giant ai patch

Browse Source
This commit is contained in:
William Blake Galbreath
2019-07-10 23:06:16 -05:00
parent 256dcbdedb
commit 62aabe5c51
2 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0013-Make-giants-naturally-spawn-and-have-AI.patch
View File

@@ -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 <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 00:43:12 -0500 Date: Sun, 12 May 2019 00:43:12 -0500
Subject: [PATCH] Make giants naturally spawn and have AI Subject: [PATCH] Make giants naturally spawn and have AI
--- ---
.../java/net/minecraft/server/BiomeBase.java | 1 + .../java/net/minecraft/server/BiomeBase.java | 1 +
.../java/net/minecraft/server/Biomes.java | 25 +++++++++++++++++ .../java/net/minecraft/server/Biomes.java | 25 ++++++++++++++++
.../minecraft/server/EntityGiantZombie.java | 28 ++++++++++++++++++- .../minecraft/server/EntityGiantZombie.java | 30 +++++++++++++++++--
.../java/net/pl3x/purpur/PurpurConfig.java | 7 +++++ .../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 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
index 72eb669c5..f1500f7a0 100644 index 72eb669c5..f1500f7a0 100644
@@ -58,11 +58,15 @@ index f4698a680..3f7f7a2de 100644
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java 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 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
+++ b/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 { @@ -21,11 +21,37 @@ public class EntityGiantZombie extends EntityMonster {
this.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue(50.0D); 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 + // Purpur start

25
patches/server/0049-Make-giants-only-as-strong-as-ravagers.patch
View File

@@ -1,25 +0,0 @@
From 163171a8e0559962f2c63bfa96b7d677aa0e505a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
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