papermc/patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch

28 lines
1.3 KiB
Diff
Raw Normal View History

2021-06-12 11:18:01 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 31 Jul 2017 01:45:19 -0500
Subject: [PATCH] Reset spawner timer when spawner event is cancelled
diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
2022-06-07 20:12:48 +00:00
index 54701d5cd45c119884f8e55f074792fb846687a7..c104ea31c63fab8f23b4db71ba6e664f710e0bee 100644
2021-06-12 11:18:01 +00:00
--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
2022-06-07 20:12:48 +00:00
@@ -160,6 +160,7 @@ public abstract class BaseSpawner {
2021-06-12 12:58:17 +00:00
// Spigot End
}
entity.spawnedViaMobSpawner = true; // Paper
+ flag = true; // Paper
// Spigot Start
if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) {
Entity vehicle = entity.getVehicle();
2022-06-07 20:12:48 +00:00
@@ -184,7 +185,7 @@ public abstract class BaseSpawner {
2021-06-12 11:18:01 +00:00
((Mob) entity).spawnAnim();
}
- flag = true;
+ //flag = true; // Paper - moved up above cancellable event
}
}