summaryrefslogtreecommitdiff
path: root/src/main/kotlin/io/dico/parcels2/ParcelGenerator.kt
diff options
context:
space:
mode:
authorDico Karssiens <dico.karssiens@gmail.com>2019-01-10 18:52:51 +0000
committerDico Karssiens <dico.karssiens@gmail.com>2019-01-10 18:52:51 +0000
commit37fa1f9bbfc852dfa67862cde3d11a4e5415db11 (patch)
tree9350ab43d11b294cd7218fec3b61fa83ea3beda8 /src/main/kotlin/io/dico/parcels2/ParcelGenerator.kt
parentd80f69488656485a8b93b4982e678ed62c5df96b (diff)
parent778e301efc09eb8326146a084bb6788be748e6f1 (diff)
Merge upstreamHEADmaster
Diffstat (limited to 'src/main/kotlin/io/dico/parcels2/ParcelGenerator.kt')
-rw-r--r--src/main/kotlin/io/dico/parcels2/ParcelGenerator.kt5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/kotlin/io/dico/parcels2/ParcelGenerator.kt b/src/main/kotlin/io/dico/parcels2/ParcelGenerator.kt
index 109c5dc..ada6d12 100644
--- a/src/main/kotlin/io/dico/parcels2/ParcelGenerator.kt
+++ b/src/main/kotlin/io/dico/parcels2/ParcelGenerator.kt
@@ -56,7 +56,7 @@ interface ParcelBlockManager {
fun getRegion(parcel: ParcelId): Region
- fun getEntities(parcel: ParcelId): Collection<Entity>
+ fun getEntities(region: Region): Collection<Entity>
fun isParcelInfoSectionLoaded(parcel: ParcelId): Boolean
@@ -92,8 +92,7 @@ inline fun ParcelBlockManager.tryDoBlockOperation(
abstract class ParcelBlockManagerBase : ParcelBlockManager {
- override fun getEntities(parcel: ParcelId): Collection<Entity> {
- val region = getRegion(parcel)
+ override fun getEntities(region: Region): Collection<Entity> {
val center = region.center
val centerLoc = Location(world, center.x, center.y, center.z)
val centerDist = (center - region.origin).add(0.2, 0.2, 0.2)