mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 14:06:17 +01:00
fe53b0e76f
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 1d522878 PR-966: Introduce getRespawnLocation as a replacement for getBedSpawnLocation cc01b745 PR-965: Add DragonBattle#setPreviouslyKilled 28e3702f SPIGOT-6921, PR-957: Add methods to remove all enchantments on an ItemStack 8872404e PR-961: Add BlockData#copyTo 4054cc7b PR-956: Add method to get an offline player's location CraftBukkit Changes: 292ec79e0 SPIGOT-7568: Call EntityChangeBlockEvent for DecoratedPot b44bf5aa8 SPIGOT-7575: SuspiciousStewMeta creates invalid PotionEffect data 161784713 PR-1340: Centralize the conversion from and to Minecraft / Bukkit registry items even more and add a test case for them b93c5a30d PR-1338: Introduce getRespawnLocation as a replacement for getBedSpawnLocation fb973486c SPIGOT-7570: PrepareItemCraftEvent#isRepair() always returns false c9c24535e PR-1337: Add DragonBattle#setPreviouslyKilled c8b4da803 SPIGOT-6921, PR-1330: Add methods to remove all enchantments on an ItemStack 95bc1c4f5 PR-1333: Add BlockData#copyTo 36e2f9ce1 PR-1329: Add method to get an offline player's location Spigot Changes: c198da22 SPIGOT-7563: Update to latest release of bungeecord-chat
92 lines
4.3 KiB
Diff
92 lines
4.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
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 b9b773d7dba559afe00b085ded3f020ea6b97c12..adbe8ca78716114a3bc03136f02c631f30aff977 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 - More DragonBattle API
|
|
+ public boolean spawnNewGatewayIfPossible() {
|
|
+ if (!this.gateways.isEmpty()) {
|
|
+ this.spawnNewGateway();
|
|
+ return true;
|
|
+ }
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ public List<EndCrystal> getSpikeCrystals() {
|
|
+ final List<EndCrystal> 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 - More DragonBattle API
|
|
+
|
|
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 dc7fdc120f4317ee1b7935ef226eddb0406aee6e..6bfabb38b51115beb2a65a165f235347838b6006 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java
|
|
@@ -137,4 +137,46 @@ public class CraftDragonBattle implements DragonBattle {
|
|
private DragonRespawnAnimation toNMSRespawnPhase(RespawnPhase phase) {
|
|
return (phase != RespawnPhase.NONE) ? DragonRespawnAnimation.values()[phase.ordinal()] : null;
|
|
}
|
|
+ // Paper start - More DragonBattle API
|
|
+ @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<org.bukkit.entity.EnderCrystal> getRespawnCrystals() {
|
|
+ if (this.handle.respawnCrystals == null) {
|
|
+ return java.util.Collections.emptyList();
|
|
+ }
|
|
+
|
|
+ final java.util.List<org.bukkit.entity.EnderCrystal> 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<org.bukkit.entity.EnderCrystal> getHealingCrystals() {
|
|
+ final java.util.List<org.bukkit.entity.EnderCrystal> 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 - More DragonBattle API
|
|
}
|