Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
55 Zeilen
2.8 KiB
Diff
55 Zeilen
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
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 e285d54450471ed22e12e77c7b829fde6b564ede..35e407ec7bd8d5cd38069fe7f2cf3d9d3bc94cbe 100644
|
|
--- a/src/main/java/org/bukkit/RegionAccessor.java
|
|
+++ b/src/main/java/org/bukkit/RegionAccessor.java
|
|
@@ -9,6 +9,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;
|
|
@@ -288,7 +289,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
|