|
42 | 42 | import com.google.common.collect.ImmutableList; |
43 | 43 | import com.google.common.collect.Lists; |
44 | 44 | import com.sk89q.worldedit.WorldEditException; |
45 | | -import com.sk89q.worldedit.entity.BaseEntity; |
46 | 45 | import com.sk89q.worldedit.entity.Entity; |
47 | 46 | import com.sk89q.worldedit.entity.metadata.EntityProperties; |
48 | 47 | import com.sk89q.worldedit.extent.AbstractDelegateExtent; |
49 | 48 | import com.sk89q.worldedit.extent.Extent; |
| 49 | +import com.sk89q.worldedit.extent.clipboard.Clipboard; |
50 | 50 | import com.sk89q.worldedit.function.CombinedRegionFunction; |
51 | 51 | import com.sk89q.worldedit.function.RegionFunction; |
52 | 52 | import com.sk89q.worldedit.function.RegionMaskingFilter; |
|
63 | 63 | import com.sk89q.worldedit.regions.CuboidRegion; |
64 | 64 | import com.sk89q.worldedit.regions.FlatRegion; |
65 | 65 | import com.sk89q.worldedit.regions.Region; |
66 | | -import com.sk89q.worldedit.util.Location; |
67 | 66 | import com.sk89q.worldedit.util.formatting.text.Component; |
68 | 67 | import com.sk89q.worldedit.util.formatting.text.TextComponent; |
69 | 68 | import org.apache.logging.log4j.Logger; |
70 | | -import org.jetbrains.annotations.Nullable; |
71 | 69 |
|
72 | 70 | import java.util.Collection; |
73 | 71 | import java.util.Collections; |
@@ -483,15 +481,19 @@ public static Collection<Entity> getEntities(Extent source, Region region) { |
483 | 481 | extent = clip.getExtent(); |
484 | 482 | } |
485 | 483 | IQueueExtent<IQueueChunk> queue = null; |
486 | | - if (Settings.settings().EXPERIMENTAL.IMPROVED_ENTITY_EDITS) { |
| 484 | + if (Settings.settings().EXPERIMENTAL.IMPROVED_ENTITY_EDITS && !(source instanceof Clipboard)) { |
487 | 485 | ParallelQueueExtent parallel = new ExtentTraverser<>(extent).findAndGet(ParallelQueueExtent.class); |
488 | 486 | if (parallel != null) { |
489 | 487 | queue = parallel.getExtent(); |
490 | 488 | } else { |
491 | 489 | queue = new ExtentTraverser<>(extent).findAndGet(SingleThreadQueueExtent.class); |
492 | 490 | } |
493 | 491 | if (queue == null) { |
494 | | - LOGGER.warn("Could not find IQueueExtent instance for entity retrieval, OncePerChunkExtent will not work."); |
| 492 | + LOGGER.warn("Could not find IQueueExtent from `" + source.getClass().getName() + |
| 493 | + "` instance for entity retrieval, OncePerChunkExtent will not work."); |
| 494 | + if (Settings.settings().ENABLED_COMPONENTS.DEBUG) { |
| 495 | + ExtentTraverser.printNestedExtents(source); |
| 496 | + } |
495 | 497 | } |
496 | 498 | } |
497 | 499 | if (queue == null) { |
|
0 commit comments