mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-09 06:50:32 +08:00
14513c3ce1
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: 92f24ff2 SPIGOT-5158: Add SuspiciousStewMeta b9bf4dae SPIGOT-5310: Add Chunk.contains b2adbb45 Add API to get/set inhabited time of a Chunk e3c812dd SPIGOT-5250: Add ChunkSnapshot.contains 71973d85 SPIGOT-5255: Raid / patrol spawn reasons CraftBukkit Changes:03b145b3
SPIGOT-5158: Add SuspiciousStewMeta9aa74304
SPIGOT-5310: Add Chunk.contains7ef2b20d
SPIGOT-3308: RecipeIterator cannot longer remove recipes023f438c
Add API to get/set inhabited time of a Chunkb79a86ed
SPIGOT-5250: Add ChunkSnapshot.containsaa492e55
SPIGOT-5255: Raid / patrol spawn reasons
23 lines
1012 B
Diff
23 lines
1012 B
Diff
From 585027fd7f1fbd432f33d451948355ae5d4ef31e Mon Sep 17 00:00:00 2001
|
|
From: kickash32 <kickash32@gmail.com>
|
|
Date: Wed, 21 Aug 2019 23:57:32 +0500
|
|
Subject: [PATCH] only add passanger entities once from spawners
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
|
index b05f6c2f2..a4e6be549 100644
|
|
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
|
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
|
@@ -195,7 +195,7 @@ public abstract class MobSpawnerAbstract {
|
|
}
|
|
|
|
private void a(Entity entity) {
|
|
- if (this.a().addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit
|
|
+ if (entity.valid || this.a().addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit // Paper
|
|
Iterator iterator = entity.getPassengers().iterator();
|
|
|
|
while (iterator.hasNext()) {
|
|
--
|
|
2.23.0
|
|
|