From 640a76219beaad632ba0a4e1f872a6706771aa66 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 10 Jan 2023 14:40:09 -0600 Subject: [PATCH] Move instantiation to ctor --- ...309-Config-to-remove-explosion-radius-clamp.patch | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/patches/server/0309-Config-to-remove-explosion-radius-clamp.patch b/patches/server/0309-Config-to-remove-explosion-radius-clamp.patch index b406e9611..db2ea8b71 100644 --- a/patches/server/0309-Config-to-remove-explosion-radius-clamp.patch +++ b/patches/server/0309-Config-to-remove-explosion-radius-clamp.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Config to remove explosion radius clamp Co-authored-by: Encode42 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java -index 1e2304347fc369e5d9fe5d4c3cca8856766f5c1a..61fe1d1c3142a6670dc74c4fb13baa9d0fb62e0c 100644 +index 1e2304347fc369e5d9fe5d4c3cca8856766f5c1a..84b230d979a91dd776e180e5b828b26bdc98ef12 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java @@ -98,7 +98,7 @@ public class EnderDragon extends Mob implements Enemy { @@ -14,10 +14,18 @@ index 1e2304347fc369e5d9fe5d4c3cca8856766f5c1a..61fe1d1c3142a6670dc74c4fb13baa9d private final int[] nodeAdjacency = new int[24]; private final BinaryHeap openSet = new BinaryHeap(); - private Explosion explosionSource = new Explosion(null, this, null, null, Double.NaN, Double.NaN, Double.NaN, Float.NaN, true, Explosion.BlockInteraction.DESTROY); // CraftBukkit - reusable source for CraftTNTPrimed.getSource() -+ private Explosion explosionSource = new Explosion(level, this, null, null, Double.NaN, Double.NaN, Double.NaN, Float.NaN, true, Explosion.BlockInteraction.DESTROY); // CraftBukkit - reusable source for CraftTNTPrimed.getSource() // Purpur ++ private Explosion explosionSource; // CraftBukkit - reusable source for CraftTNTPrimed.getSource() // Purpur - moved instantiation to ctor // Paper start - add var for save custom podium @Nullable private BlockPos podium; +@@ -107,6 +107,7 @@ public class EnderDragon extends Mob implements Enemy { + + public EnderDragon(EntityType entitytypes, Level world) { + super(EntityType.ENDER_DRAGON, world); ++ this.explosionSource = new Explosion(this.level, this, null, null, Double.NaN, Double.NaN, Double.NaN, Float.NaN, true, Explosion.BlockInteraction.DESTROY); // Purpur - moved instantiation from field + this.subEntities = new EnderDragonPart[]{this.head, this.neck, this.body, this.tail1, this.tail2, this.tail3, this.wing1, this.wing2}; + this.setHealth(this.getMaxHealth()); + this.noPhysics = true; diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java index c0d39afe5b80159ed9aaca4ddd4763d707882f2e..3c9e0cee78deeae6b47a186f1bfc47f3956ec9c7 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java