aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch')
-rw-r--r--patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 65092a2a40..71cdedc8fa 100644
--- a/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -5,18 +5,18 @@ 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
-index 0f5a5168d168b39f0da3ed12389b11b586d168e6..8540905242fc84ab8a26cf0a8e875ef252bc3d5d 100644
+index 5d6403fa27521860a69a707dc4358b013adfafd7..20c39481bcf05e0d43c97b7e841ec9f5f6a0d45d 100644
--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-@@ -165,6 +165,7 @@ public abstract class BaseSpawner {
- // Spigot End
+@@ -166,6 +166,7 @@ public abstract class BaseSpawner {
}
+
entity.spawnedViaMobSpawner = true; // Paper
+ flag = true; // Paper
- // Spigot Start
+ // CraftBukkit start
if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) {
- Entity vehicle = entity.getVehicle();
-@@ -189,7 +190,7 @@ public abstract class BaseSpawner {
+ continue;
+@@ -182,7 +183,7 @@ public abstract class BaseSpawner {
((Mob) entity).spawnAnim();
}