2022-04-07 10:31:30 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Doc <nachito94@msn.com>
Date: Sun, 3 Apr 2022 11:31:42 -0400
2024-01-18 18:52:00 +01:00
Subject: [PATCH] Allow changing the EnderDragon podium
2022-04-07 10:31:30 +02:00
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
2024-06-14 03:30:23 +02:00
index 201ef4a3f5bc8633f7a51e151e9e87efc4004cad..45673a7630977e833df84e29e2f0b0012a3ab049 100644
2022-04-07 10:31:30 +02:00
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
2024-06-14 03:30:23 +02:00
@@ -103,6 +103,10 @@ public class EnderDragon extends Mob implements Enemy {
2023-06-08 10:47:19 +02:00
private final int[] nodeAdjacency;
private final BinaryHeap openSet;
2023-03-14 21:55:49 +01:00
private final Explosion explosionSource; // CraftBukkit - reusable source for CraftTNTPrimed.getSource()
2024-01-18 18:52:00 +01:00
+ // Paper start - Allow changing the EnderDragon podium
2022-04-07 10:31:30 +02:00
+ @Nullable
+ private BlockPos podium;
2024-01-18 18:52:00 +01:00
+ // Paper end - Allow changing the EnderDragon podium
2022-04-07 10:31:30 +02:00
public EnderDragon(EntityType<? extends EnderDragon> entitytypes, Level world) {
super(EntityType.ENDER_DRAGON, world);
2024-06-14 03:30:23 +02:00
@@ -143,6 +147,19 @@ public class EnderDragon extends Mob implements Enemy {
2022-04-07 10:31:30 +02:00
return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D);
}
2024-01-18 18:52:00 +01:00
+ // Paper start - Allow changing the EnderDragon podium
2022-04-07 10:31:30 +02:00
+ public BlockPos getPodium() {
+ if (this.podium == null) {
2023-06-08 22:56:13 +02:00
+ return EndPodiumFeature.getLocation(this.getFightOrigin());
2022-04-07 10:31:30 +02:00
+ }
+ return this.podium;
+ }
+
+ public void setPodium(@Nullable BlockPos blockPos) {
+ this.podium = blockPos;
+ }
2024-01-18 18:52:00 +01:00
+ // Paper end - Allow changing the EnderDragon podium
2022-04-07 10:31:30 +02:00
+
@Override
public boolean isFlapping() {
float f = Mth.cos(this.flapTime * 6.2831855F);
2024-06-14 03:30:23 +02:00
@@ -1010,7 +1027,7 @@ public class EnderDragon extends Mob implements Enemy {
2022-04-07 10:31:30 +02:00
d0 = segment2[1] - segment1[1];
}
} else {
2023-06-08 10:47:19 +02:00
- BlockPos blockposition = this.level().getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.getLocation(this.fightOrigin));
2024-01-18 18:52:00 +01:00
+ BlockPos blockposition = this.level().getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.getPodium()); // Paper - Allow changing the EnderDragon podium
2022-04-07 10:31:30 +02:00
double d1 = Math.max(Math.sqrt(blockposition.distToCenterSqr(this.position())) / 4.0D, 1.0D);
d0 = (double) segmentOffset / d1;
2024-06-14 03:30:23 +02:00
@@ -1037,7 +1054,7 @@ public class EnderDragon extends Mob implements Enemy {
2022-04-07 10:31:30 +02:00
vec3d = this.getViewVector(tickDelta);
}
} else {
2023-06-08 10:47:19 +02:00
- BlockPos blockposition = this.level().getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.getLocation(this.fightOrigin));
2024-01-18 18:52:00 +01:00
+ BlockPos blockposition = this.level().getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.getPodium()); // Paper - Allow changing the EnderDragon podium
2022-04-07 10:31:30 +02:00
f1 = Math.max((float) Math.sqrt(blockposition.distToCenterSqr(this.position())) / 4.0F, 1.0F);
float f3 = 6.0F / f1;
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.java
2024-04-16 21:44:59 +02:00
index 803d227281d70606691eed95c4b10a27ca5d1125..5663f2ff1eba4a5e00c76c9d735cb553faae6a04 100644
2022-04-07 10:31:30 +02:00
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.java
2024-04-16 21:44:59 +02:00
@@ -43,7 +43,7 @@ public class DragonDeathPhase extends AbstractDragonPhaseInstance {
2022-04-07 10:31:30 +02:00
if (this.targetLocation == null) {
2024-04-12 21:14:06 +02:00
BlockPos blockPos = this.dragon
.level()
- .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, EndPodiumFeature.getLocation(this.dragon.getFightOrigin()));
+ .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, this.dragon.getPodium()); // Paper - Allow changing the EnderDragon podium
2022-04-07 10:31:30 +02:00
this.targetLocation = Vec3.atBottomCenterOf(blockPos);
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.java
2024-04-16 21:44:59 +02:00
index 707ef45ccd7fbcbe1947c8941846277f19ee54c9..ddf668205a7cb29b9018bf9eea49667b5fd2d471 100644
2022-04-07 10:31:30 +02:00
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.java
2022-12-07 22:35:34 +01:00
@@ -54,7 +54,7 @@ public class DragonHoldingPatternPhase extends AbstractDragonPhaseInstance {
2022-04-07 10:31:30 +02:00
if (this.currentPath != null && this.currentPath.isDone()) {
2024-04-12 21:14:06 +02:00
BlockPos blockPos = this.dragon
.level()
- .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, new BlockPos(EndPodiumFeature.getLocation(this.dragon.getFightOrigin())));
+ .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, new BlockPos(this.dragon.getPodium())); // Paper - Allow changing the EnderDragon podium
2022-04-07 10:31:30 +02:00
int i = this.dragon.getDragonFight() == null ? 0 : this.dragon.getDragonFight().getCrystalsAlive();
if (this.dragon.getRandom().nextInt(i + 3) == 0) {
this.dragon.getPhaseManager().setPhase(EnderDragonPhase.LANDING_APPROACH);
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.java
2024-04-16 21:44:59 +02:00
index e731d0f74692615ce5f42f690e36bd906a39c1dd..557de8a8e21e7f049b6acf27b4ec927ef5a9f9cb 100644
2022-04-07 10:31:30 +02:00
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.java
2024-04-12 21:14:06 +02:00
@@ -53,7 +53,7 @@ public class DragonLandingApproachPhase extends AbstractDragonPhaseInstance {
2022-04-07 10:31:30 +02:00
int i = this.dragon.findClosestNode();
2024-04-12 21:14:06 +02:00
BlockPos blockPos = this.dragon
.level()
- .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.getLocation(this.dragon.getFightOrigin()));
+ .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.dragon.getPodium()); // Paper - Allow changing the EnderDragon podium
2024-04-16 21:44:59 +02:00
Player player = this.dragon
.level()
.getNearestPlayer(NEAR_EGG_TARGETING, this.dragon, (double)blockPos.getX(), (double)blockPos.getY(), (double)blockPos.getZ());
2022-04-07 10:31:30 +02:00
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.java
2024-04-12 21:14:06 +02:00
index d913147d692e7e58bec4fac44c7e93a1822e8f65..3b960060f152d0352c2f8cdc1c71543cd7fa0dbd 100644
2022-04-07 10:31:30 +02:00
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.java
2024-04-12 21:14:06 +02:00
@@ -41,7 +41,7 @@ public class DragonLandingPhase extends AbstractDragonPhaseInstance {
2022-04-07 10:31:30 +02:00
public void doServerTick() {
if (this.targetLocation == null) {
2024-04-12 21:14:06 +02:00
this.targetLocation = Vec3.atBottomCenterOf(
- this.dragon.level().getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.getLocation(this.dragon.getFightOrigin()))
+ this.dragon.level().getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.dragon.getPodium()) // Paper - Allow changing the EnderDragon podium
);
2022-04-07 10:31:30 +02:00
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.java
2024-04-16 21:44:59 +02:00
index 8d66284eb96cfc0392c211842e87875a095c3ca2..718bf877179f85ee3f0de384ca3a8aaebaa067a5 100644
2022-04-07 10:31:30 +02:00
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.java
2024-04-12 21:14:06 +02:00
@@ -25,7 +25,7 @@ public class DragonTakeoffPhase extends AbstractDragonPhaseInstance {
2022-04-07 10:31:30 +02:00
if (!this.firstTick && this.currentPath != null) {
2024-04-12 21:14:06 +02:00
BlockPos blockPos = this.dragon
.level()
- .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.getLocation(this.dragon.getFightOrigin()));
+ .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.dragon.getPodium()); // Paper - Allow changing the EnderDragon podium
if (!blockPos.closerToCenterThan(this.dragon.position(), 10.0)) {
2022-04-07 10:31:30 +02:00
this.dragon.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
2024-01-18 18:52:00 +01:00
index 25b3d889a1742c347e60725df8d6f6c1cee264c7..7b7b89e67d53ed70efae714192c5fa32977f3d9c 100644
2022-04-07 10:31:30 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
2023-08-14 01:32:51 +02:00
@@ -73,4 +73,22 @@ public class CraftEnderDragon extends CraftMob implements EnderDragon, CraftEnem
2022-04-07 10:31:30 +02:00
public int getDeathAnimationTicks() {
return this.getHandle().dragonDeathTime;
}
+
2024-01-18 18:52:00 +01:00
+ // Paper start - Allow changing the EnderDragon podium
2022-04-07 10:31:30 +02:00
+ @Override
+ public org.bukkit.Location getPodium() {
+ net.minecraft.core.BlockPos blockPosOrigin = this.getHandle().getPodium();
+ return new org.bukkit.Location(getWorld(), blockPosOrigin.getX(), blockPosOrigin.getY(), blockPosOrigin.getZ());
+ }
+
+ @Override
+ public void setPodium(org.bukkit.Location location) {
+ if (location == null) {
+ this.getHandle().setPodium(null);
+ } else {
+ org.apache.commons.lang.Validate.isTrue(location.getWorld() == null || location.getWorld().equals(getWorld()), "You cannot set a podium in a different world to where the dragon is");
2023-03-15 00:10:18 +01:00
+ this.getHandle().setPodium(io.papermc.paper.util.MCUtil.toBlockPos(location));
2022-04-07 10:31:30 +02:00
+ }
+ }
2024-01-18 18:52:00 +01:00
+ // Paper end - Allow changing the EnderDragon podium
2022-04-07 10:31:30 +02:00
}