diff options
author | Nassim Jahnke <[email protected]> | 2022-06-07 19:20:30 +0200 |
---|---|---|
committer | Nassim Jahnke <[email protected]> | 2022-06-07 19:20:30 +0200 |
commit | 028e2d9f005783229c2fd055ad7f9568efe9f00a (patch) | |
tree | e34abdf27fc8a64f3139eda00b8a6e81551d21bd /patches/api/0202-Spawn-Reason-API.patch | |
parent | 56e64243ed4688d1d8a510f066800debebc614b5 (diff) | |
download | Paper-028e2d9f005783229c2fd055ad7f9568efe9f00a.tar.gz Paper-028e2d9f005783229c2fd055ad7f9568efe9f00a.zip |
API patches
Diffstat (limited to 'patches/api/0202-Spawn-Reason-API.patch')
-rw-r--r-- | patches/api/0202-Spawn-Reason-API.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/patches/api/0202-Spawn-Reason-API.patch b/patches/api/0202-Spawn-Reason-API.patch new file mode 100644 index 0000000000..60d33effef --- /dev/null +++ b/patches/api/0202-Spawn-Reason-API.patch @@ -0,0 +1,54 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Aikar <[email protected]> +Date: Thu, 10 Apr 2014 23:18:28 -0400 +Subject: [PATCH] Spawn Reason API + + +diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java +index a89fff5c164881be0286ec2240e94dd5883ecc40..e55f6e2baf35dbd91c433ab9e62713eaac85435b 100644 +--- a/src/main/java/org/bukkit/RegionAccessor.java ++++ b/src/main/java/org/bukkit/RegionAccessor.java +@@ -10,6 +10,7 @@ import org.bukkit.block.data.BlockData; + import org.bukkit.entity.Entity; + import org.bukkit.entity.EntityType; + import org.bukkit.entity.LivingEntity; ++import org.bukkit.event.entity.CreatureSpawnEvent; + import org.bukkit.util.Consumer; + import org.jetbrains.annotations.NotNull; + import org.jetbrains.annotations.Nullable; +@@ -309,7 +310,34 @@ public interface RegionAccessor { + * {@link Entity} requested cannot be spawned + */ + @NotNull +- <T extends Entity> T spawn(@NotNull Location location, @NotNull Class<T> clazz, @Nullable Consumer<T> function) throws IllegalArgumentException; ++ // Paper start ++ public default <T extends Entity> T spawn(@NotNull Location location, @NotNull Class<T> clazz, @Nullable Consumer<T> function) throws IllegalArgumentException { ++ return spawn(location, clazz, CreatureSpawnEvent.SpawnReason.CUSTOM, function); ++ } ++ ++ @NotNull ++ public default <T extends Entity> T spawn(@NotNull Location location, @NotNull Class<T> clazz, @NotNull CreatureSpawnEvent.SpawnReason reason) throws IllegalArgumentException { ++ return spawn(location, clazz, reason, null); ++ } ++ ++ @NotNull ++ public default <T extends Entity> T spawn(@NotNull Location location, @NotNull Class<T> clazz, @NotNull CreatureSpawnEvent.SpawnReason reason, @Nullable Consumer<T> function) throws IllegalArgumentException { ++ return spawn(location, clazz, function, reason); ++ } ++ ++ @NotNull ++ public default Entity spawnEntity(@NotNull Location loc, @NotNull org.bukkit.entity.EntityType type, @NotNull CreatureSpawnEvent.SpawnReason reason) { ++ return spawn(loc, (Class<Entity>) type.getEntityClass(), reason, null); ++ } ++ ++ @NotNull ++ public default Entity spawnEntity(@NotNull Location loc, @NotNull org.bukkit.entity.EntityType type, @NotNull CreatureSpawnEvent.SpawnReason reason, @Nullable Consumer<Entity> function) { ++ return spawn(loc, (Class<Entity>) type.getEntityClass(), reason, function); ++ } ++ ++ @NotNull ++ public <T extends Entity> T spawn(@NotNull Location location, @NotNull Class<T> clazz, @Nullable Consumer<T> function, @NotNull CreatureSpawnEvent.SpawnReason reason) throws IllegalArgumentException; ++ // Paper end + + /** + * Creates a new entity at the given {@link Location} with the supplied |