Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly Paper Changes: 1c446c22 Fix CME when adding a passenger during Spawn events (#4616) f3927b25 Fix "Not a string" Map Conversion spam - Fixes #3901 1b64536b Clarify the JavaDocs for Entity.getEntitySpawnReason() in response to #4361 6b22219c Remove unnecessary space for provided plugins, fixes #4608 3ece9036 [CI-SKIP] [Auto] Rebuild Patches 551fac7e Fix deop kicking non-whitelisted player when white list is not enabled faf8eb03 Updated Upstream (CraftBukkit) (#4622)
2026-02-21 18:37:42 +01:00 · 2020-10-10 16:41:13 -05:00
parent 86a07695dc
commit d652384e4a
44 changed files with 52 additions and 71 deletions
--- a/patches/server/0123-Customizable-WitherBoss-Health-and-Healing.patch
+++ b/patches/server/0123-Customizable-WitherBoss-Health-and-Healing.patch
@@ -0,0 +1,75 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: jmp <jasonpenilla2@me.com>
+Date: Thu, 20 Aug 2020 17:38:12 -0700
+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 1054b492c2..2a288d3726 100644
+--- a/src/main/java/net/minecraft/server/EntityWither.java
+++ b/src/main/java/net/minecraft/server/EntityWither.java
+@@ -145,6 +145,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
+         skull.setPositionRaw(headX, headY, headZ);
+         world.addEntity(skull);
+     }
+
+    public void initAttributes(World world) {
+        if (world != null) {
+            this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(world.purpurConfig.witherMaxHealth);
+        }
+    }
+     // Purpur end
+ 
+     @Override
+@@ -348,7 +354,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
+ 
+             this.setInvul(i);
+             if (this.ticksLived % 10 == 0) {
+-                this.heal(10.0F, EntityRegainHealthEvent.RegainReason.WITHER_SPAWN); // CraftBukkit
+                this.heal(this.getMaxHealth() / 33, EntityRegainHealthEvent.RegainReason.WITHER_SPAWN); // CraftBukkit // Purpur - use max health for healing instead of a constant
+             }
+ 
+         } else {
+@@ -457,8 +463,10 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
+                 }
+             }
+ 
+-            if (this.ticksLived % 20 == 0) {
+-                this.heal(1.0F, EntityRegainHealthEvent.RegainReason.REGEN); // CraftBukkit
+            // Purpur start - customizable heal rate and amount
+            if (this.ticksLived % world.purpurConfig.witherHealthRegenDelay == 0) {
+                this.heal(world.purpurConfig.witherHealthRegenAmount, EntityRegainHealthEvent.RegainReason.REGEN); // CraftBukkit
+                // Purpur end
+             }
+ 
+             //this.bossBattle.setProgress(this.getHealth() / this.getMaxHealth()); // Paper - Moved down
+@@ -473,6 +481,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
+     public void beginSpawnSequence() {
+         this.setInvul(220);
+         this.setHealth(this.getMaxHealth() / 3.0F);
+        initAttributes(this.world); // Purpur - building the wither with soul_sand + wither_skeleton_skulls does not call prepare, so we need to call this manually
+     }
+ 
+     @Override
+diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+index 4d6dc69def..66c9da792c 100644
+--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+@@ -903,10 +903,16 @@ public class PurpurWorldConfig {
+     public boolean witherRidable = false;
+     public boolean witherRidableInWater = false;
+     public double witherMaxY = 256D;
+    public double witherMaxHealth = 300.0D;
+    public float witherHealthRegenAmount = 1.0f;
+    public int witherHealthRegenDelay = 20;
+     private void witherSettings() {
+         witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
+         witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
+         witherMaxY = getDouble("mobs.wither.ridable-max-y", witherMaxY);
+        witherMaxHealth = getDouble("mobs.wither.max-health", witherMaxHealth);
+        witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
+        witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
+     }
+ 
+     public boolean witherSkeletonRidable = false;