Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 19:10:09 +01:00
Allow seting custom podium location for ender dragon (#7695)
Dieser Commit ist enthalten in:
Pedro
GitHub
Ursprung
62dcff3e8d
Commit
29144573e6
33
patches/api/0377-Allow-to-change-the-podium-of-the-EnderDragon.patch
Normale Datei
33
patches/api/0377-Allow-to-change-the-podium-of-the-EnderDragon.patch
Normale Datei
@ -0,0 +1,33 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Doc <nachito94@msn.com>
|
||||||
|
Date: Sat, 2 Apr 2022 23:03:32 -0300
|
||||||
|
Subject: [PATCH] Allow to change the podium of the EnderDragon
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java
|
||||||
|
index 856015b08bfa3f18b3df11e25efd079d4a4f7eca..23cbaf886e230d38b3023923f74d1a6c34cd9b9d 100644
|
||||||
|
--- a/src/main/java/org/bukkit/entity/EnderDragon.java
|
||||||
|
+++ b/src/main/java/org/bukkit/entity/EnderDragon.java
|
||||||
|
@@ -104,4 +104,22 @@ public interface EnderDragon extends ComplexLivingEntity, Boss, Mob {
|
||||||
|
* @return this dragon's death animation ticks
|
||||||
|
*/
|
||||||
|
int getDeathAnimationTicks();
|
||||||
|
+
|
||||||
|
+ // Paper start
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Get the podium location used by the ender dragon.
|
||||||
|
+ *
|
||||||
|
+ * @return the podium location of the dragon
|
||||||
|
+ */
|
||||||
|
+ @NotNull
|
||||||
|
+ org.bukkit.Location getPodium();
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Sets the location of the podium for the ender dragon.
|
||||||
|
+ *
|
||||||
|
+ * @param location the location of the podium or null to use the default podium location (exit portal of the end)
|
||||||
|
+ */
|
||||||
|
+ void setPodium(@Nullable org.bukkit.Location location);
|
||||||
|
+ // Paper end
|
||||||
|
}
|
||||||
151
patches/server/0890-Allow-to-change-the-podium-for-the-EnderDragon.patch
Normale Datei
151
patches/server/0890-Allow-to-change-the-podium-for-the-EnderDragon.patch
Normale Datei
@ -0,0 +1,151 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Doc <nachito94@msn.com>
|
||||||
|
Date: Sun, 3 Apr 2022 11:31:42 -0400
|
||||||
|
Subject: [PATCH] Allow to change the podium for the EnderDragon
|
||||||
|
|
||||||
|
|
||||||
|
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 1eb76c456790b81b657090377dd5ea547898f9a5..8c4db2f0e5158872879da52a96bc592145e52e13 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
|
||||||
|
@@ -100,6 +100,10 @@ public class EnderDragon extends Mob implements Enemy {
|
||||||
|
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()
|
||||||
|
+ // Paper start - add var for save custom podium
|
||||||
|
+ @Nullable
|
||||||
|
+ private BlockPos podium;
|
||||||
|
+ // Paper end
|
||||||
|
|
||||||
|
public EnderDragon(EntityType<? extends EnderDragon> entitytypes, Level world) {
|
||||||
|
super(EntityType.ENDER_DRAGON, world);
|
||||||
|
@@ -120,6 +124,19 @@ public class EnderDragon extends Mob implements Enemy {
|
||||||
|
return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Paper start
|
||||||
|
+ public BlockPos getPodium() {
|
||||||
|
+ if (this.podium == null) {
|
||||||
|
+ return EndPodiumFeature.END_PODIUM_LOCATION;
|
||||||
|
+ }
|
||||||
|
+ return this.podium;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void setPodium(@Nullable BlockPos blockPos) {
|
||||||
|
+ this.podium = blockPos;
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
+
|
||||||
|
@Override
|
||||||
|
public boolean isFlapping() {
|
||||||
|
float f = Mth.cos(this.flapTime * 6.2831855F);
|
||||||
|
@@ -947,7 +964,7 @@ public class EnderDragon extends Mob implements Enemy {
|
||||||
|
d0 = segment2[1] - segment1[1];
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
- BlockPos blockposition = this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION);
|
||||||
|
+ BlockPos blockposition = this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.getPodium()); // Paper - use custom podium
|
||||||
|
double d1 = Math.max(Math.sqrt(blockposition.distToCenterSqr(this.position())) / 4.0D, 1.0D);
|
||||||
|
|
||||||
|
d0 = (double) segmentOffset / d1;
|
||||||
|
@@ -974,7 +991,7 @@ public class EnderDragon extends Mob implements Enemy {
|
||||||
|
vec3d = this.getViewVector(tickDelta);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
- BlockPos blockposition = this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION);
|
||||||
|
+ BlockPos blockposition = this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.getPodium()); // Paper - use custom podium
|
||||||
|
|
||||||
|
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
|
||||||
|
index a64ee433e34538ce2b52207b6183999ae611e5dd..0f78e1ab090bb1df7b863c90b3c7465a3ce28c8c 100644
|
||||||
|
--- 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
|
||||||
|
@@ -32,7 +32,7 @@ public class DragonDeathPhase extends AbstractDragonPhaseInstance {
|
||||||
|
public void doServerTick() {
|
||||||
|
++this.time;
|
||||||
|
if (this.targetLocation == null) {
|
||||||
|
- BlockPos blockPos = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, EndPodiumFeature.END_PODIUM_LOCATION);
|
||||||
|
+ BlockPos blockPos = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, this.dragon.getPodium()); // Paper - use custom podium
|
||||||
|
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
|
||||||
|
index e58f608e424e384606289d9ff27bf8f9c63aeeb2..4c338d7f3d5274a36db768e4a1cdedca130127d4 100644
|
||||||
|
--- 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
|
||||||
|
@@ -55,7 +55,7 @@ public class DragonHoldingPatternPhase extends AbstractDragonPhaseInstance {
|
||||||
|
|
||||||
|
private void findNewTarget() {
|
||||||
|
if (this.currentPath != null && this.currentPath.isDone()) {
|
||||||
|
- BlockPos blockPos = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, new BlockPos(EndPodiumFeature.END_PODIUM_LOCATION));
|
||||||
|
+ BlockPos blockPos = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.dragon.getPodium()); // Paper - use custom podium
|
||||||
|
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
|
||||||
|
index fdfdd42a30d752b11d18f2cefe84c1e9ddec41a2..5fca7c4e1d1d9da6f29ad70f1b5703c7f092d851 100644
|
||||||
|
--- 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
|
||||||
|
@@ -52,7 +52,7 @@ public class DragonLandingApproachPhase extends AbstractDragonPhaseInstance {
|
||||||
|
private void findNewTarget() {
|
||||||
|
if (this.currentPath == null || this.currentPath.isDone()) {
|
||||||
|
int i = this.dragon.findClosestNode();
|
||||||
|
- BlockPos blockPos = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION);
|
||||||
|
+ BlockPos blockPos = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.dragon.getPodium()); // Paper - use custom podium
|
||||||
|
Player player = this.dragon.level.getNearestPlayer(NEAR_EGG_TARGETING, this.dragon, (double)blockPos.getX(), (double)blockPos.getY(), (double)blockPos.getZ());
|
||||||
|
int j;
|
||||||
|
if (player != null) {
|
||||||
|
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
|
||||||
|
index c3eb04fa31a8e767c737091c2e1a3f858589e16b..1ee3ba970e33e20e5c72bc2f4153889b60c0e77e 100644
|
||||||
|
--- 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
|
||||||
|
@@ -39,7 +39,7 @@ public class DragonLandingPhase extends AbstractDragonPhaseInstance {
|
||||||
|
@Override
|
||||||
|
public void doServerTick() {
|
||||||
|
if (this.targetLocation == null) {
|
||||||
|
- this.targetLocation = Vec3.atBottomCenterOf(this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION));
|
||||||
|
+ this.targetLocation = Vec3.atBottomCenterOf(this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.dragon.getPodium())); // Paper - use custom podium
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.targetLocation.distanceToSqr(this.dragon.getX(), this.dragon.getY(), this.dragon.getZ()) < 1.0D) {
|
||||||
|
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
|
||||||
|
index 0ae65d0fa03d12486f48b0274b6e2d4eea169caf..ffe89d8c1f22f672d145fedb3bb102589dc31656 100644
|
||||||
|
--- 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
|
||||||
|
@@ -24,7 +24,7 @@ public class DragonTakeoffPhase extends AbstractDragonPhaseInstance {
|
||||||
|
@Override
|
||||||
|
public void doServerTick() {
|
||||||
|
if (!this.firstTick && this.currentPath != null) {
|
||||||
|
- BlockPos blockPos = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.END_PODIUM_LOCATION);
|
||||||
|
+ BlockPos blockPos = this.dragon.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.dragon.getPodium()); // Paper - use custom podium
|
||||||
|
if (!blockPos.closerToCenterThan(this.dragon.position(), 10.0D)) {
|
||||||
|
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
|
||||||
|
index cd487bd68f9a8177ae3e015b3a5d1bc469743f48..eeb6d48da156602c046db891cac0ccb4fa639473 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
|
||||||
|
@@ -79,4 +79,22 @@ public class CraftEnderDragon extends CraftMob implements EnderDragon {
|
||||||
|
public int getDeathAnimationTicks() {
|
||||||
|
return this.getHandle().dragonDeathTime;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // Paper start
|
||||||
|
+ @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");
|
||||||
|
+ this.getHandle().setPodium(new net.minecraft.core.BlockPos(location.getX(), location.getY(), location.getZ()));
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
}
|
||||||
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren