Few ridables fixes (ravager still broke af tho)

This commit is contained in:
William Blake Galbreath
2020-08-21 19:43:43 -05:00
parent 10007d7369
commit 5630d9a693
2 changed files with 143 additions and 122 deletions

View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Customizable WitherBoss Health and Healing
Adds the ability to customize the health of the Wither Boss, as well as the amount that it heals, and how often in the PurpurWorldConfig.
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
index 6c48c9659d..624821be11 100644
index 1054b492c..2a288d372 100644
--- a/src/main/java/net/minecraft/server/EntityWither.java
+++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -144,6 +144,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -145,6 +145,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
skull.setPositionRaw(headX, headY, headZ);
world.addEntity(skull);
}
@@ -22,7 +22,7 @@ index 6c48c9659d..624821be11 100644
// Purpur end
@Override
@@ -347,7 +353,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -348,7 +354,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
this.setInvul(i);
if (this.ticksLived % 10 == 0) {
@@ -31,7 +31,7 @@ index 6c48c9659d..624821be11 100644
}
} else {
@@ -456,8 +462,10 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -457,8 +463,10 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
}
}
@@ -44,7 +44,7 @@ index 6c48c9659d..624821be11 100644
}
//this.bossBattle.setProgress(this.getHealth() / this.getMaxHealth()); // Paper - Moved down
@@ -472,6 +480,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -473,6 +481,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
public void beginSpawnSequence() {
this.setInvul(220);
this.setHealth(this.getMaxHealth() / 3.0F);
@@ -53,7 +53,7 @@ index 6c48c9659d..624821be11 100644
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 66ac267f00..c7ccc896a0 100644
index 66ac267f0..c7ccc896a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -887,10 +887,16 @@ public class PurpurWorldConfig {