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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
c8542f23 Fix MC-99259 Wither Boss Bar doesn't update until invulnerability period is over (#4164)
This commit is contained in:
William Blake Galbreath
2020-08-20 23:53:54 -05:00
parent 6802a97f26
commit 630ac49e65
4 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 862b8c181a...c8542f2365

2
current-paper
View File

@@ -1 +1 @@
1.16.2--e51a14afcac0a36bd605f287a4c76e4ac56fd943 1.16.2--82d84e85939c4020eac7d3431011196ae793680e

6
patches/server/0132-Customizable-WitherBoss-Health-and-Healing.patch
View File

@@ -6,7 +6,7 @@ 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. 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 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
index 1511212cbf..e8f81cd109 100644 index 29bb74e51e..d847c03c0c 100644
--- a/src/main/java/net/minecraft/server/EntityWither.java --- a/src/main/java/net/minecraft/server/EntityWither.java
+++ b/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -41,6 +41,15 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -41,6 +41,15 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -46,9 +46,9 @@ index 1511212cbf..e8f81cd109 100644
} }
+ // Purpur end + // Purpur end
this.bossBattle.setProgress(this.getHealth() / this.getMaxHealth()); //this.bossBattle.setProgress(this.getHealth() / this.getMaxHealth()); // Paper - Moved down
} }
@@ -354,6 +365,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -355,6 +366,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
public void beginSpawnSequence() { public void beginSpawnSequence() {
this.setInvul(220); this.setInvul(220);
this.setHealth(this.getMaxHealth() / 3.0F); this.setHealth(this.getMaxHealth() / 3.0F);

22
patches/server/0133-Fix-MC-99259-Show-wither-health-bar-even-during-invu.patch
View File

@@ -1,22 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 20 Aug 2020 21:32:44 -0500
Subject: [PATCH] Fix MC-99259 - Show wither health bar even during
invulnerable stage
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
index e8f81cd109..8a0c623214 100644
--- a/src/main/java/net/minecraft/server/EntityWither.java
+++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -354,8 +354,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
}
// Purpur end
- this.bossBattle.setProgress(this.getHealth() / this.getMaxHealth());
+ // this.bossBattle.setProgress(this.getHealth() / this.getMaxHealth()); // moved down
}
+ this.bossBattle.setProgress(this.getHealth() / this.getMaxHealth()); // Purpur - moved from above
}
public static boolean c(IBlockData iblockdata) {