Skip to content

Commit 9e0618e

Browse files
committed
SPIGOT-7937: Cannot spawn minecart during world generation with minecart_improvements enabled
1 parent 1eb4d28 commit 9e0618e

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,13 @@ private static <R extends EntityFireball> Function<SpawnData, R> createFireball(
491491
}
492492

493493
private static <R extends EntityMinecartAbstract> Function<SpawnData, R> createMinecart(EntityTypes<R> entityTypes) {
494-
return spawnData -> EntityMinecartAbstract.createMinecart(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), entityTypes, EntitySpawnReason.TRIGGERED, ItemStack.EMPTY, null);
494+
return spawnData -> {
495+
if (spawnData.normalWorld()) {
496+
return EntityMinecartAbstract.createMinecart(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), entityTypes, EntitySpawnReason.TRIGGERED, ItemStack.EMPTY, null);
497+
} else {
498+
return combine(fromEntityType(entityTypes), (spawnData2, entity) -> entity.setInitialPos(spawnData.x(), spawnData.y(), spawnData.z())).apply(spawnData);
499+
}
500+
};
495501
}
496502

497503
private static <R extends net.minecraft.world.entity.Entity> Function<SpawnData, R> createAndMove(EntityTypes<R> entityTypes) {

0 commit comments

Comments
 (0)