Skip to content

Commit 5ca6798

Browse files
hopefully fix go to resource bug
1 parent ea3c8b5 commit 5ca6798

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

src/main/kotlin/org/openbase/planetsudo/level/AbstractLevel.kt

+5-11
Original file line numberDiff line numberDiff line change
@@ -264,19 +264,13 @@ abstract class AbstractLevel : AbstractGameObject, Runnable {
264264
* @param resourceType
265265
* @return
266266
*/
267-
fun getCloseResource(agent: Agent, resourceType: ResourceType): Resource? {
267+
fun getCloseResource(agent: Agent, resourceType: ResourceType): Resource? =
268268
synchronized(RESOURCES_LOCK) {
269-
for (resource in resources) {
270-
if (!resource.isUsed && resource.type == resourceType && (!resource.isOwned || resource.owner!!.team != agent.team) &&
271-
resource.isSaveFor(agent) &&
272-
resource.bounds.intersects(agent.viewBounds)
273-
) {
274-
return resource
275-
}
276-
}
269+
resources
270+
.filter { it.type == resourceType }
271+
.filter { it.isSaveFor(agent) }
272+
.findAvailableResource(agent, agent.viewBounds)
277273
}
278-
return null
279-
}
280274

281275
/**
282276
* WARNING: method returns null in case of no close resource.

0 commit comments

Comments
 (0)