Paper/Spigot-Server-Patches/0230-Reset-spawner-timer-when-spawner-event-is-cancelled.patch

33 lines
1.3 KiB
Diff
Raw Normal View History

2017-10-05 15:38:21 +02:00
From 886463be7f9b8db11b507becc9620e75dbc520d4 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/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
2017-08-09 20:44:28 +02:00
index 06b064a78..c29df55fa 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
2017-08-09 20:44:28 +02:00
@@ -113,6 +113,9 @@ public abstract class MobSpawnerAbstract {
{
entity.fromMobSpawner = true;
}
+
+ flag = true; // Paper
+
if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) {
continue;
}
2017-08-09 20:44:28 +02:00
@@ -123,7 +126,7 @@ public abstract class MobSpawnerAbstract {
entityinsentient.doSpawnEffect();
}
- flag = true;
+ /*flag = true;*/ // Paper - moved up above cancellable event
}
}
--
2017-10-05 15:38:21 +02:00
2.14.2