mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 20:21:51 +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
22 lines
1,014 B
Diff
22 lines
1,014 B
Diff
From 83d95ae5e0411d44c2995528f937b0cff3eecee2 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 41001b02a6..df494d37be 100644
|
|
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
|
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
|
@@ -196,7 +196,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.25.0
|
|
|