From 3693bbdc6b65e68db10375d3eeab70f06708b729 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 9 May 2024 14:51:33 +0100 Subject: Use internals for getting block/entity counts For a long time I've been meaning to move some of this logic internally as this would allow us to avoid hitting systems like block state snapshots which can create issues as many of the spigot implementations of this stuff are increasingly broken, leading to unexpected crashes during ticking, even if the API cannot properly interact with these such states/items, it's generally more preferable to not crash the server in the course, and just let those interactions fail more gracefully. --- patches/api/0153-PreSpawnerSpawnEvent.patch | 47 +++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 patches/api/0153-PreSpawnerSpawnEvent.patch (limited to 'patches/api/0153-PreSpawnerSpawnEvent.patch') diff --git a/patches/api/0153-PreSpawnerSpawnEvent.patch b/patches/api/0153-PreSpawnerSpawnEvent.patch new file mode 100644 index 0000000000..4b6bbe6f7a --- /dev/null +++ b/patches/api/0153-PreSpawnerSpawnEvent.patch @@ -0,0 +1,47 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Phoenix616 +Date: Tue, 18 Sep 2018 23:50:10 +0100 +Subject: [PATCH] PreSpawnerSpawnEvent + +This adds a separate event before an entity is spawned by a spawner +which contains the location of the spawner too similarly to how the +SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for +spawners. + +Dropped as it does not apply due to the earlier PreCreatureSpawnEvent patch not being applied + +diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java +new file mode 100644 +index 0000000000000000000000000000000000000000..2910f0bf929d918c86510f29d9361bbc19411256 +--- /dev/null ++++ b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java +@@ -0,0 +1,29 @@ ++package com.destroystokyo.paper.event.entity; ++ ++import org.bukkit.Location; ++import org.bukkit.entity.EntityType; ++import org.bukkit.event.entity.CreatureSpawnEvent; ++import org.jetbrains.annotations.ApiStatus; ++import org.jetbrains.annotations.NotNull; ++ ++/** ++ * Called before an entity is spawned into a world by a spawner. ++ *

++ * This only includes the spawner's location and not the full BlockState snapshot for performance reasons. ++ * If you really need it you have to get the spawner yourself. ++ */ ++public class PreSpawnerSpawnEvent extends PreCreatureSpawnEvent { ++ ++ @NotNull private final Location spawnerLocation; ++ ++ @ApiStatus.Internal ++ public PreSpawnerSpawnEvent(@NotNull Location location, @NotNull EntityType type, @NotNull Location spawnerLocation) { ++ super(location, type, CreatureSpawnEvent.SpawnReason.SPAWNER); ++ this.spawnerLocation = spawnerLocation; ++ } ++ ++ @NotNull ++ public Location getSpawnerLocation() { ++ return this.spawnerLocation.clone(); ++ } ++} -- cgit v1.2.3