mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
papermc/Spigot-Server-Patches/0301-PreSpawnerSpawnEvent.patch

33 lines
1.7 KiB
Diff
Raw Normal View History

Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
2020-05-01 22:03:47 +00:00
From b5db507c149f5d4a0013fc3547cd106217921d9b Mon Sep 17 00:00:00 2001
Add a separate PreSpawnerSpawnEvent (#1455) This event extends the PreCreatureSpawnEvent and includes the position of the spawner that spawned the entitiy. (similarly to how the SpawnerSpawnEvent contains the spawner's BlockState). This one doesn't include the state though as getting the block and generating that snapshot is a bit wasteful.
2018-09-18 23:34:11 +00:00
From: Phoenix616 <mail@moep.tv>
Date: Tue, 18 Sep 2018 23:53:23 +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.
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
2020-05-01 22:03:47 +00:00
index 43c491f71b..cb7cb789b8 100644
Add a separate PreSpawnerSpawnEvent (#1455) This event extends the PreCreatureSpawnEvent and includes the position of the spawner that spawned the entitiy. (similarly to how the SpawnerSpawnEvent contains the spawner's BlockState). This one doesn't include the state though as getting the block and generating that snapshot is a bit wasteful.
2018-09-18 23:34:11 +00:00
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
Houston, we got a patch (#2731) * Houston, we got a patch * is this the end of the beginning or the beginning of the end
2019-12-12 16:20:43 +00:00
@@ -111,11 +111,11 @@ public abstract class MobSpawnerAbstract {
Use the entity registry id instead of translation key when posting PreCreatureSpawnEvent and PreSpawnerSpawnEvent
2019-06-15 05:06:36 +00:00
Houston, we got a patch (#2731) * Houston, we got a patch * is this the end of the beginning or the beginning of the end
2019-12-12 16:20:43 +00:00
org.bukkit.entity.EntityType type = org.bukkit.entity.EntityType.fromName(key);
if (type != null) {
- com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent event;
- event = new com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent(
Add a separate PreSpawnerSpawnEvent (#1455) This event extends the PreCreatureSpawnEvent and includes the position of the spawner that spawned the entitiy. (similarly to how the SpawnerSpawnEvent contains the spawner's BlockState). This one doesn't include the state though as getting the block and generating that snapshot is a bit wasteful.
2018-09-18 23:34:11 +00:00
+ com.destroystokyo.paper.event.entity.PreSpawnerSpawnEvent event;
+ event = new com.destroystokyo.paper.event.entity.PreSpawnerSpawnEvent(
Houston, we got a patch (#2731) * Houston, we got a patch * is this the end of the beginning or the beginning of the end
2019-12-12 16:20:43 +00:00
MCUtil.toLocation(world, d3, d4, d5),
type,
- org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER
More patches for 1.14
2019-05-05 08:33:44 +00:00
+ MCUtil.toLocation(world, blockposition)
Houston, we got a patch (#2731) * Houston, we got a patch * is this the end of the beginning or the beginning of the end
2019-12-12 16:20:43 +00:00
);
if (!event.callEvent()) {
flag = true;
Add a separate PreSpawnerSpawnEvent (#1455) This event extends the PreCreatureSpawnEvent and includes the position of the spawner that spawned the entitiy. (similarly to how the SpawnerSpawnEvent contains the spawner's BlockState). This one doesn't include the state though as getting the block and generating that snapshot is a bit wasteful.
2018-09-18 23:34:11 +00:00
--
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
2020-05-01 22:03:47 +00:00
2.26.2
Add a separate PreSpawnerSpawnEvent (#1455) This event extends the PreCreatureSpawnEvent and includes the position of the spawner that spawned the entitiy. (similarly to how the SpawnerSpawnEvent contains the spawner's BlockState). This one doesn't include the state though as getting the block and generating that snapshot is a bit wasteful.
2018-09-18 23:34:11 +00:00
Reference in a new issue Copy permalink