mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
714f0a04d0
Upstream has released updates that appears to apply and compile correctly Paper Changes: 60135676 [Auto] Updated Upstream (CraftBukkit) fa90052a Fix MC-125757 (#3859) 071c08d7 Only convert lore lines that actually look legacy 8c4787e3 Misc Improvements to Async Teleporting and Light patch 6133c83b [Auto] Updated Upstream (Bukkit/CraftBukkit)
44 lines
2.0 KiB
Diff
44 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jason Bierque <bierquejason@gmail.com>
|
|
Date: Wed, 1 Jul 2020 22:36:06 +0200
|
|
Subject: [PATCH] Customizable EnderDragon Health
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
|
index 08fa5a975..47d71a166 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
|
@@ -62,6 +62,16 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
|
|
this.bN = new DragonControllerManager(this);
|
|
}
|
|
|
|
+ // Purpur start
|
|
+ @Override
|
|
+ public void initAttributes(World world) {
|
|
+ if (world != null) {
|
|
+ this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(world.purpurConfig.enderDragonMaxHealth);
|
|
+ setHealth(getMaxHealth());
|
|
+ }
|
|
+ }
|
|
+ // Purpur end
|
|
+
|
|
public static AttributeProvider.Builder m() {
|
|
return EntityInsentient.p().a(GenericAttributes.MAX_HEALTH, 200.0D);
|
|
}
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index f2ca515c9..e6b41ab92 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -269,9 +269,11 @@ public class PurpurWorldConfig {
|
|
|
|
public boolean enderDragonAlwaysDropsEggBlock = false;
|
|
public boolean enderDragonAlwaysDropsFullExp = false;
|
|
+ public double enderDragonMaxHealth = 200.0D;
|
|
private void enderDragonSettings() {
|
|
enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender_dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
|
|
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
|
|
+ enderDragonMaxHealth = getDouble("mobs.ender_dragon.max-health", enderDragonMaxHealth);
|
|
}
|
|
|
|
public boolean endermanAllowGriefing = true;
|