Skip to content

Commit 4720a01

Browse files
committed
Pick-up single map item
1 parent e363413 commit 4720a01

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

  • common/src/main/kotlin/accieo/cobbleworkers/jobs

common/src/main/kotlin/accieo/cobbleworkers/jobs/Scout.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
package accieo.cobbleworkers.jobs
1010

11-
import accieo.cobbleworkers.Cobbleworkers
1211
import accieo.cobbleworkers.config.CobbleworkersConfigHolder
1312
import accieo.cobbleworkers.enums.JobType
1413
import accieo.cobbleworkers.interfaces.Worker
@@ -183,16 +182,18 @@ object Scout : Worker {
183182
}
184183

185184
if (CobbleworkersNavigationUtils.isPokemonAtPosition(pokemonEntity, currentTarget)) {
186-
// TODO: Pokémon should only pick-up a single map
187185
if (closestItem.stack.item == Items.MAP) {
188-
val stack = closestItem.stack.copy()
186+
val singleItem = closestItem.stack.split(1)
187+
188+
if (closestItem.stack.isEmpty) {
189+
closestItem.discard()
190+
}
189191

190-
closestItem.discard()
191192
val map = createStructureMap(world as ServerWorld, origin)
192193
if (map != null) {
193194
heldItemsByPokemon[pokemonId] = listOf(map)
194195
} else {
195-
heldItemsByPokemon[pokemonId] = listOf(stack)
196+
heldItemsByPokemon[pokemonId] = listOf(singleItem)
196197
}
197198
}
198199
CobbleworkersNavigationUtils.releaseTarget(pokemonId, world)

0 commit comments

Comments
 (0)