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
|
2021-06-12 12:58:17 +00:00
|
|
|
index e310c1eb1108780bcff4d7ba9d49cefa2926287c..12a78685848b7fd945a472902d8200ea1d50b9ec 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
|
2021-06-12 12:58:17 +00:00
|
|
|
@@ -167,6 +167,7 @@ public abstract class BaseSpawner {
|
|
|
|
|
// 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();
|
|
|
|
|
@@ -190,7 +191,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
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
