mirror of
https://github.com/PaperMC/Paper.git
synced 2025-06-01 13:11:12 +00:00
f00727c57e
Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: MiniDigger | Martin <admin@minidigger.dev> Co-authored-by: Nassim Jahnke <nassim@njahnke.dev> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com> Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com> Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
71 lines
3.1 KiB
Diff
71 lines
3.1 KiB
Diff
--- a/net/minecraft/util/SpawnUtil.java
|
|
+++ b/net/minecraft/util/SpawnUtil.java
|
|
@@ -16,6 +_,7 @@
|
|
import net.minecraft.world.level.block.state.BlockState;
|
|
|
|
public class SpawnUtil {
|
|
+
|
|
public static <T extends Mob> Optional<T> trySpawnMob(
|
|
EntityType<T> entityType,
|
|
EntitySpawnReason spawnReason,
|
|
@@ -27,6 +_,24 @@
|
|
SpawnUtil.Strategy strategy,
|
|
boolean checkCollision
|
|
) {
|
|
+ // CraftBukkit start
|
|
+ return trySpawnMob(entityType, spawnReason, level, pos, attempts, range, yOffset, strategy, checkCollision, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT, null); // Paper - pre creature spawn event
|
|
+ }
|
|
+
|
|
+ public static <T extends Mob> Optional<T> trySpawnMob(
|
|
+ EntityType<T> entityType,
|
|
+ EntitySpawnReason spawnReason,
|
|
+ ServerLevel level,
|
|
+ BlockPos pos,
|
|
+ int attempts,
|
|
+ int range,
|
|
+ int yOffset,
|
|
+ SpawnUtil.Strategy strategy,
|
|
+ boolean checkCollision,
|
|
+ org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason,
|
|
+ @javax.annotation.Nullable Runnable onAbort // Paper - pre creature spawn event
|
|
+ ) {
|
|
+ // CraftBukkit end
|
|
BlockPos.MutableBlockPos mutableBlockPos = pos.mutable();
|
|
|
|
for (int i = 0; i < attempts; i++) {
|
|
@@ -39,15 +_,32 @@
|
|
!checkCollision
|
|
|| level.noCollision(entityType.getSpawnAABB(mutableBlockPos.getX() + 0.5, mutableBlockPos.getY(), mutableBlockPos.getZ() + 0.5))
|
|
)) {
|
|
+ // Paper start - PreCreatureSpawnEvent
|
|
+ final com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent event = new com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent(
|
|
+ org.bukkit.craftbukkit.util.CraftLocation.toBukkit(pos, level),
|
|
+ org.bukkit.craftbukkit.entity.CraftEntityType.minecraftToBukkit(entityType),
|
|
+ reason
|
|
+ );
|
|
+ if (!event.callEvent()) {
|
|
+ if (event.shouldAbortSpawn()) {
|
|
+ if (onAbort != null) {
|
|
+ onAbort.run();
|
|
+ }
|
|
+ return Optional.empty();
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
+ // Paper end - PreCreatureSpawnEvent
|
|
T mob = (T)entityType.create(level, null, mutableBlockPos, spawnReason, false, false);
|
|
if (mob != null) {
|
|
if (mob.checkSpawnRules(level, spawnReason) && mob.checkSpawnObstruction(level)) {
|
|
- level.addFreshEntityWithPassengers(mob);
|
|
+ level.addFreshEntityWithPassengers(mob, reason); // CraftBukkit
|
|
+ if (mob.isRemoved()) return Optional.empty(); // CraftBukkit
|
|
mob.playAmbientSound();
|
|
return Optional.of(mob);
|
|
}
|
|
|
|
- mob.discard();
|
|
+ mob.discard(null); // CraftBukkit - add Bukkit remove cause
|
|
}
|
|
}
|
|
}
|