63 lines
3.0 KiB
Diff
63 lines
3.0 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/World.java b/src/main/java/org/bukkit/World.java
|
||
|
|
index 476184db904d8a2e1347e1219e8ba196bf4da5cb..c1010e314144a65e12eaf5514d639a87f45891a9 100644
|
||
|
|
--- a/src/main/java/org/bukkit/World.java
|
||
|
|
+++ b/src/main/java/org/bukkit/World.java
|
||
|
|
@@ -1,6 +1,8 @@
|
||
|
|
package org.bukkit;
|
||
|
|
|
||
|
|
import java.io.File;
|
||
|
|
+
|
||
|
|
+import org.bukkit.event.entity.CreatureSpawnEvent;
|
||
|
|
import org.bukkit.generator.ChunkGenerator;
|
||
|
|
|
||
|
|
import java.util.ArrayList;
|
||
|
|
@@ -2249,6 +2251,12 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
|
||
|
|
@NotNull
|
||
|
|
public <T extends Entity> T spawn(@NotNull Location location, @NotNull Class<T> clazz) throws IllegalArgumentException;
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
+ @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);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/**
|
||
|
|
* Spawn an entity of a specific class at the given {@link Location}, with
|
||
|
|
* the supplied function run before the entity is added to the world.
|
||
|
|
@@ -2266,7 +2274,28 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
|
||
|
|
* {@link Entity} requested cannot be spawned
|
||
|
|
*/
|
||
|
|
@NotNull
|
||
|
|
- public <T extends Entity> T spawn(@NotNull Location location, @NotNull Class<T> clazz, @Nullable Consumer<T> function) throws IllegalArgumentException;
|
||
|
|
+ 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, @Nullable Consumer<T> function) throws IllegalArgumentException {
|
||
|
|
+ return spawn(location, clazz, function, reason);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ @NotNull
|
||
|
|
+ public default Entity spawnEntity(@NotNull Location loc, @NotNull EntityType type, @NotNull CreatureSpawnEvent.SpawnReason reason) {
|
||
|
|
+ return spawn(loc, (Class<Entity>) type.getEntityClass(), reason, null);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ @NotNull
|
||
|
|
+ public default Entity spawnEntity(@NotNull Location loc, @NotNull 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
|
||
|
|
|
||
|
|
/**
|
||
|
|
* Spawn a {@link FallingBlock} entity at the given {@link Location} of
|