From b316d460813fc1076648fe0772afc1b6c381d18e Mon Sep 17 00:00:00 2001 From: BillyGalbreath 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 index 8384a2cbf8..258e96ba5c 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -140,6 +140,9 @@ public abstract class MobSpawnerAbstract { { entity.fromMobSpawner = true; } + + flag = true; // Paper + if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) { Entity vehicle = entity.getVehicle(); if (vehicle != null) { @@ -157,7 +160,7 @@ public abstract class MobSpawnerAbstract { ((EntityInsentient) entity).doSpawnEffect(); } - flag = true; + /*flag = true;*/ // Paper - moved up above cancellable event } } -- 2.24.1