star/KSpigot
1
0
Fork 0
Code Pull Requests Packages Activity

Update StructureLoader.kt

Browse Source
This commit is contained in:
bluefireoly
2020-09-13 17:33:38 +02:00
parent 433a260653
commit 3c899621a8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/net/axay/kspigot/structures/StructureLoader.kt
View File

@@ -1,6 +1,9 @@
@file:Suppress("unused")
package net.axay.kspigot.structures package net.axay.kspigot.structures
import net.axay.kspigot.extensions.geometry.LocationArea import net.axay.kspigot.extensions.geometry.LocationArea
import net.axay.kspigot.extensions.geometry.blockLoc
import net.axay.kspigot.extensions.geometry.relationTo import net.axay.kspigot.extensions.geometry.relationTo
import org.bukkit.Location import org.bukkit.Location
import org.bukkit.block.Block import org.bukkit.block.Block
@@ -13,11 +16,11 @@ fun LocationArea.loadStructure(includeBlocks: Boolean = true, includeEntities: B
= Structure( = Structure(
if (includeBlocks) if (includeBlocks)
fillBlocks.mapTo(HashSet()) { fillBlocks.mapTo(HashSet()) {
SingleStructureData(it.location relationTo minLoc, StructureDataBlock(it)) } SingleStructureData(it.location relationTo minLoc.blockLoc, StructureDataBlock(it)) }
else emptySet(), else emptySet(),
if (includeEntities) if (includeEntities)
entities.mapTo(HashSet()) { entities.mapTo(HashSet()) {
SingleStructureData(it.location relationTo minLoc, StructureDataEntity(it)) } SingleStructureData(it.location relationTo minLoc.blockLoc, StructureDataEntity(it)) }
else emptySet() else emptySet()
) )