30 lines
1.8 KiB
Diff
30 lines
1.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
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/world/level/MobSpawnerAbstract.java b/src/main/java/net/minecraft/world/level/MobSpawnerAbstract.java
|
||
|
|
index d4b8126f12fdf7d9b4f882d3ed7d8da544ed9e8a..867478484c0ba4ff467b96e458689937299b981d 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/MobSpawnerAbstract.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/MobSpawnerAbstract.java
|
||
|
|
@@ -132,11 +132,11 @@ public abstract class MobSpawnerAbstract {
|
||
|
|
|
||
|
|
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(
|
||
|
|
MCUtil.toLocation(world, d3, d4, d5),
|
||
|
|
type,
|
||
|
|
- org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER
|
||
|
|
+ MCUtil.toLocation(world, blockposition)
|
||
|
|
);
|
||
|
|
if (!event.callEvent()) {
|
||
|
|
flag = true;
|