mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 15:17:17 +01:00
ac554ad46d
Updated Upstream (Bukkit/CraftBukkit) 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: fa99e752 PR-1007: Add ItemMeta#getAsComponentString() 94a91782 Fix copy-pasted BlockType.Typed documentation 9b34ac8c Largely restore deprecated PotionData API 51a6449b PR-1008: Deprecate ITEMS_TOOLS, removed in 1.20.5 702d15fe Fix Javadoc reference 42f6cdf4 PR-919: Add internal ItemType and BlockType, delegate Material methods to them 237bb37b SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 035ea146 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 8c7880fb PR-1004: Improve field rename handling and centralize conversion between bukkit and string more 87c90e93 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent CraftBukkit Changes: 4af0f22e8 SPIGOT-7664: Item meta should prevail over block states c2ccc46ec SPIGOT-7666: Fix access to llama and horse special slot 124ac66d7 SPIGOT-7665: Fix ThrownPotion#getEffects() implementation only bringing custom effects 66f1f439a Restore null page behaviour of signed books even though not strictly allowed by API 6118e5398 Fix regression listening to minecraft:brand custom payloads c1a26b366 Fix unnecessary and potential not thread-safe chat visibility check 12360a7ec Remove unused imports 147b098b4 PR-1397: Add ItemMeta#getAsComponentString() 428aefe0e Largely restore deprecated PotionData API afe5b5ee9 PR-1275: Add internal ItemType and BlockType, delegate Material methods to them 8afeafa7d SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 4e7d749d4 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 441880757 Support both entity_data and bucket_entity_data on axolotl/fish buckets 0e22fdd1e Fix custom direct BlockState being not correctly set in DamageSource f2182ed47 SPIGOT-7659: TropicalFishBucketMeta should use BUCKET_ENTITY_DATA 2a6207fe1 PR-1393: Improve field rename handling and centralize conversion between bukkit and string more c024a5039 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent 741b84480 PR-1390: Improve internal handling of damage sources 0364df4e1 SPIGOT-7657: Error when loading angry entities
133 lines
4.8 KiB
Diff
133 lines
4.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Tue, 7 Jul 2020 10:53:22 -0700
|
|
Subject: [PATCH] More World API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
|
index 77314fdbd99a5cc34e7a1df4692ba8a1685ef002..f4d31d9d0f4cbd2621adf97a20b65ae83e5fd064 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -3849,6 +3849,122 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
@Nullable
|
|
StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Locates the nearest biome based on an origin, biome type, and radius to search.
|
|
+ * Step defaults to {@code 8}.
|
|
+ *
|
|
+ * @param origin Origin location
|
|
+ * @param biome Biome to find
|
|
+ * @param radius radius to search
|
|
+ * @return Location of biome or null if not found in specified radius
|
|
+ * @deprecated use {@link #locateNearestBiome(Location, int, Biome...)}
|
|
+ */
|
|
+ @Deprecated
|
|
+ @Nullable
|
|
+ default Location locateNearestBiome(@NotNull Location origin, @NotNull Biome biome, int radius) {
|
|
+ return java.util.Optional.ofNullable(this.locateNearestBiome(origin, radius, 8, 8, biome)).map(BiomeSearchResult::getLocation).orElse(null);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Locates the nearest biome based on an origin, biome type, and radius to search
|
|
+ * and step
|
|
+ *
|
|
+ * @param origin Origin location
|
|
+ * @param biome Biome to find
|
|
+ * @param radius radius to search
|
|
+ * @param step Search step 1 would mean checking every block, 8 would be every 8th block
|
|
+ * @return Location of biome or null if not found in specified radius
|
|
+ * @deprecated use {@link #locateNearestBiome(Location, int, int, int, Biome...)}
|
|
+ */
|
|
+ @Deprecated
|
|
+ @Nullable
|
|
+ default Location locateNearestBiome(@NotNull Location origin, @NotNull Biome biome, int radius, int step) {
|
|
+ return java.util.Optional.ofNullable(this.locateNearestBiome(origin, radius, step, step, biome)).map(BiomeSearchResult::getLocation).orElse(null);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Checks if the world:
|
|
+ * <ul>
|
|
+ * <li>evaporates water</li>
|
|
+ * <li>dries sponges</li>
|
|
+ * <li>has lava spread faster and further</li>
|
|
+ * </ul>
|
|
+ *
|
|
+ * @return true if ultrawarm, false if not
|
|
+ * @deprecated use {@link #isUltraWarm()}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
|
|
+ boolean isUltrawarm();
|
|
+
|
|
+ /**
|
|
+ * Gets the coordinate scaling of this world.
|
|
+ *
|
|
+ * @return the coordinate scale
|
|
+ */
|
|
+ double getCoordinateScale();
|
|
+
|
|
+ /**
|
|
+ * Checks if the world has skylight access
|
|
+ *
|
|
+ * @return whether there is skylight
|
|
+ * @deprecated use {@link #hasSkyLight()}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
|
|
+ boolean hasSkylight();
|
|
+
|
|
+ /**
|
|
+ * Checks if the world has a bedrock ceiling
|
|
+ *
|
|
+ * @return whether the world has a bedrock ceiling
|
|
+ * @deprecated use {@link #hasCeiling()}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
|
|
+ boolean hasBedrockCeiling();
|
|
+
|
|
+ /**
|
|
+ * Checks if beds work
|
|
+ *
|
|
+ * @return whether beds work
|
|
+ * @deprecated use {@link #isBedWorks()}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
|
|
+ boolean doesBedWork();
|
|
+
|
|
+ /**
|
|
+ * Checks if respawn anchors work
|
|
+ *
|
|
+ * @return whether respawn anchors work
|
|
+ * @deprecated use {@link #isRespawnAnchorWorks()}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
|
|
+ boolean doesRespawnAnchorWork();
|
|
+
|
|
+ /**
|
|
+ * Checks if this world has a fixed time
|
|
+ *
|
|
+ * @return whether this world has fixed time
|
|
+ */
|
|
+ boolean isFixedTime();
|
|
+
|
|
+ /**
|
|
+ * Gets the collection of materials that burn infinitely in this world.
|
|
+ *
|
|
+ * @return the materials that will forever stay lit by fire
|
|
+ */
|
|
+ @NotNull
|
|
+ Collection<Material> getInfiniburn();
|
|
+
|
|
+ /**
|
|
+ * Posts a specified game event at a location
|
|
+ *
|
|
+ * @param sourceEntity optional source entity
|
|
+ * @param gameEvent the game event to post
|
|
+ * @param position the position in the world where to post the event to listeners
|
|
+ */
|
|
+ void sendGameEvent(@Nullable Entity sourceEntity, @NotNull GameEvent gameEvent, @NotNull Vector position);
|
|
+ // Paper end
|
|
+
|
|
// Spigot start
|
|
@Deprecated(forRemoval = true) // Paper
|
|
public class Spigot {
|