From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sun, 18 Dec 2022 13:40:05 -0800 Subject: [PATCH] More DragonBattle API == AT == public net.minecraft.world.level.dimension.end.EndDragonFight GATEWAY_COUNT public net.minecraft.world.level.dimension.end.EndDragonFight gateways public net.minecraft.world.level.dimension.end.EndDragonFight respawnCrystals public net.minecraft.world.level.dimension.end.EndDragonFight spawnNewGateway(Lnet/minecraft/core/BlockPos;)V diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java index c63f05a3d29146bfb8d5c93df5706145e3eaf716..630971d7a87c12798672af9635535eaf80a3ec9c 100644 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java @@ -439,6 +439,24 @@ public class EndDragonFight { this.gateways.clear(); } + // Paper start + public boolean spawnNewGatewayIfPossible() { + if (!this.gateways.isEmpty()) { + this.spawnNewGateway(); + return true; + } + return false; + } + + public List getSpikeCrystals() { + final List endCrystals = new java.util.ArrayList<>(); + for (final SpikeFeature.EndSpike spike : SpikeFeature.getSpikesForLevel(this.level)) { + endCrystals.addAll(this.level.getEntitiesOfClass(EndCrystal.class, spike.getTopBoundingBox())); + } + return endCrystals; + } + // Paper end + private void spawnNewGateway() { if (!this.gateways.isEmpty()) { int i = (Integer) this.gateways.remove(this.gateways.size() - 1); diff --git a/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java b/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java index 9895225593a6b6d22c4c5d3966dd79de1dfa4582..ccc73410ba6938dfdb7c23c2124f9f657b3a7e5d 100644 --- a/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java +++ b/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java @@ -132,4 +132,46 @@ public class CraftDragonBattle implements DragonBattle { private DragonRespawnAnimation toNMSRespawnPhase(RespawnPhase phase) { return (phase != RespawnPhase.NONE) ? DragonRespawnAnimation.values()[phase.ordinal()] : null; } + // Paper start + @Override + public int getGatewayCount() { + return EndDragonFight.GATEWAY_COUNT - this.handle.gateways.size(); + } + + @Override + public boolean spawnNewGateway() { + return this.handle.spawnNewGatewayIfPossible(); + } + + @Override + public void spawnNewGateway(final io.papermc.paper.math.Position position) { + this.handle.spawnNewGateway(io.papermc.paper.util.MCUtil.toBlockPos(position)); + } + + @Override + public java.util.List getRespawnCrystals() { + if (this.handle.respawnCrystals == null) { + return java.util.Collections.emptyList(); + } + + final java.util.List enderCrystals = new java.util.ArrayList<>(); + for (final net.minecraft.world.entity.boss.enderdragon.EndCrystal endCrystal : this.handle.respawnCrystals) { + if (!endCrystal.isRemoved() && endCrystal.isAlive() && endCrystal.valid) { + enderCrystals.add(((org.bukkit.entity.EnderCrystal) endCrystal.getBukkitEntity())); + } + } + return java.util.Collections.unmodifiableList(enderCrystals); + } + + @Override + public java.util.List getHealingCrystals() { + final java.util.List enderCrystals = new java.util.ArrayList<>(); + for (final net.minecraft.world.entity.boss.enderdragon.EndCrystal endCrystal : this.handle.getSpikeCrystals()) { + if (!endCrystal.isRemoved() && endCrystal.isAlive() && endCrystal.valid) { + enderCrystals.add(((org.bukkit.entity.EnderCrystal) endCrystal.getBukkitEntity())); + } + } + return java.util.Collections.unmodifiableList(enderCrystals); + } + // Paper end }