31 Zeilen
1.4 KiB
Diff
31 Zeilen
1.4 KiB
Diff
From 0a60c7d137249b42e32668e922eba7d6e637ace7 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
|
|
index ab5d83d3..c38295a0 100644
|
|
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
|
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
|
@@ -142,6 +142,7 @@ public abstract class MobSpawnerAbstract {
|
|
}
|
|
entity.spawnedViaMobSpawner = true; // Paper
|
|
// Spigot Start
|
|
+ flag = true; // Paper
|
|
if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) {
|
|
Entity vehicle = entity.getVehicle();
|
|
if (vehicle != null) {
|
|
@@ -160,7 +161,7 @@ public abstract class MobSpawnerAbstract {
|
|
((EntityInsentient) entity).doSpawnEffect();
|
|
}
|
|
|
|
- flag = true;
|
|
+ /*flag = true;*/ // Paper - moved up above cancellable event
|
|
}
|
|
}
|
|
|
|
--
|
|
2.25.1.windows.1
|
|
|