Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 19:40:07 +01:00
9946cef8c5
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f52c70ab Fix incorrect nullability in MultipleFacing 6af4c0b2 SPIGOT-5311: Add API to get/set item associated with throwable projectiles 97aeae56 Add set/isAware to disable Vanilla AI components of a Mob CraftBukkit Changes:fba9f487Improve legacy conversion of some materials that changed post flatteningb1ba8749Move Bukkit.Aware loading/saving to correct locationf7cdb53cSPIGOT-5311: Add API to get/set item associated with throwable projectiles689f429c#634: Cross platform patch scriptsab85433dAdd set/isAware to disable Vanilla AI components of a Mob Spigot Changes: 8faa8b45 Rebuild patches
31 Zeilen
1.3 KiB
Diff
31 Zeilen
1.3 KiB
Diff
From 59016efe7eff58950e55e8102fc6ee2af6b41461 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 ab5d83d34d..c38295a09d 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.0
|
|
|