core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0313-PreSpawnerSpawnEvent.p...

33 lines
1.6 KiB
Diff
Raw Normal View History

Revert "Optimize Pathfinding" This patch appears to be causing some issues with 1.14.3 entity AI
2019-06-25 19:18:50 +00:00
From aeb29f0e2b123d32d1a8a09033ab4ae79b48e2bb 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/Spigot) 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: 3dc4cdcd Update to Minecraft 1.14.3-pre4 88b25a8c SPIGOT-5098: Add a method to allow colored sign changes 6d913552 Update to Minecraft 1.14.3-pre4 CraftBukkit Changes: f1f33559 Update to Minecraft 1.14.3 8a3d3f49 SPIGOT-5098: Add a method to allow colored sign changes 533290e2 SPIGOT-5100: Console warning from pig zombie targeting 6dde4b9f SPIGOT-5094: Allow opening merchant for wandering traders and hide the xp bar for custom merchants 9af90077 SPIGOT-5097: Bukkit.clearRecipes() no longer working 38fa220f Fix setting game rules via the API fe3930ce Update to Minecraft 1.14.3-pre4 da071ec5 Remove outdated build delay. Spigot Changes: 4d2f30f1 Update to Minecraft 1.14.3 f16400e3 Update to Minecraft 1.14.3-pre4
2019-06-25 01:47:58 +00:00
index 6f5d8b0315..079099e308 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
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 3dc4cdcd Update to Minecraft 1.14.3-pre4 88b25a8c SPIGOT-5098: Add a method to allow colored sign changes 6d913552 Update to Minecraft 1.14.3-pre4 CraftBukkit Changes: f1f33559 Update to Minecraft 1.14.3 8a3d3f49 SPIGOT-5098: Add a method to allow colored sign changes 533290e2 SPIGOT-5100: Console warning from pig zombie targeting 6dde4b9f SPIGOT-5094: Allow opening merchant for wandering traders and hide the xp bar for custom merchants 9af90077 SPIGOT-5097: Bukkit.clearRecipes() no longer working 38fa220f Fix setting game rules via the API fe3930ce Update to Minecraft 1.14.3-pre4 da071ec5 Remove outdated build delay. Spigot Changes: 4d2f30f1 Update to Minecraft 1.14.3 f16400e3 Update to Minecraft 1.14.3-pre4
2019-06-25 01:47:58 +00:00
@@ -110,11 +110,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
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
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(
+ com.destroystokyo.paper.event.entity.PreSpawnerSpawnEvent event;
+ event = new com.destroystokyo.paper.event.entity.PreSpawnerSpawnEvent(
More patches for 1.14
2019-05-05 08:33:44 +00:00
MCUtil.toLocation(world, d3, d4, d5),
type,
- org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER
+ MCUtil.toLocation(world, blockposition)
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
);
if (!event.callEvent()) {
flag = true;
--
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 3dc4cdcd Update to Minecraft 1.14.3-pre4 88b25a8c SPIGOT-5098: Add a method to allow colored sign changes 6d913552 Update to Minecraft 1.14.3-pre4 CraftBukkit Changes: f1f33559 Update to Minecraft 1.14.3 8a3d3f49 SPIGOT-5098: Add a method to allow colored sign changes 533290e2 SPIGOT-5100: Console warning from pig zombie targeting 6dde4b9f SPIGOT-5094: Allow opening merchant for wandering traders and hide the xp bar for custom merchants 9af90077 SPIGOT-5097: Bukkit.clearRecipes() no longer working 38fa220f Fix setting game rules via the API fe3930ce Update to Minecraft 1.14.3-pre4 da071ec5 Remove outdated build delay. Spigot Changes: 4d2f30f1 Update to Minecraft 1.14.3 f16400e3 Update to Minecraft 1.14.3-pre4
2019-06-25 01:47:58 +00:00
2.22.0
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