@@ -5,16 +5,13 @@ import com.cobblemon.mod.common.api.Priority
55import com.cobblemon.mod.common.api.battles.model.actor.ActorType
66import com.cobblemon.mod.common.api.events.CobblemonEvents
77import com.cobblemon.mod.common.api.events.drops.LootDroppedEvent
8- import com.cobblemon.mod.common.api.tags.CobblemonItemTags
98import com.cobblemon.mod.common.api.text.text
109import com.cobblemon.mod.common.api.types.tera.TeraTypes
1110import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
1211import com.cobblemon.mod.common.client.gui.interact.wheel.InteractWheelOption
1312import com.cobblemon.mod.common.client.gui.interact.wheel.Orientation
14- import com.cobblemon.mod.common.pokemon.Pokemon
1513import com.cobblemon.mod.common.util.asTranslated
1614import com.cobblemon.mod.common.util.cobblemonResource
17- import com.cobblemon.mod.common.util.getPlayer
1815import com.cobblemon.mod.common.util.giveOrDropItemStack
1916import com.cobblemon.mod.common.util.isInBattle
2017import generations.gg.generations.core.generationscore.common.GenerationsCore
@@ -24,10 +21,7 @@ import generations.gg.generations.core.generationscore.common.battle.BattleCondi
2421import generations.gg.generations.core.generationscore.common.battle.BattleConditionsProcessor.sendToPlayersAndSpectators
2522import generations.gg.generations.core.generationscore.common.battle.BattleSideData
2623import generations.gg.generations.core.generationscore.common.battle.ConditionsData
27- import generations.gg.generations.core.generationscore.common.battle.ExpAllCalculator.calculateMultiplier
28- import generations.gg.generations.core.generationscore.common.battle.ExpAllCalculator.hasExpAll
2924import generations.gg.generations.core.generationscore.common.battle.GenerationsInstructionProcessor
30- import generations.gg.generations.core.generationscore.common.battle.grantExpAll
3125import generations.gg.generations.core.generationscore.common.client.render.rarecandy.instanceOrNull
3226import generations.gg.generations.core.generationscore.common.config.LegendKeys
3327import generations.gg.generations.core.generationscore.common.config.SpeciesKey
@@ -43,7 +37,6 @@ import net.minecraft.client.Minecraft
4337import net.minecraft.resources.ResourceLocation
4438import net.minecraft.world.item.ItemStack
4539import org.joml.Vector3f
46- import kotlin.math.PI
4740
4841class GenerationsCobblemonEvents {
4942
@@ -81,8 +74,10 @@ class GenerationsCobblemonEvents {
8174 .filter { battleActor -> battleActor is PlayerBattleActor }
8275 .map { battleActor -> battleActor as PlayerBattleActor }
8376 .forEach { actor ->
84- val stack = actor.entity?.inventory?.items?.first { a -> a.item is PostBattleUpdatingItem }
85- stack.item.instanceOrNull<PostBattleUpdatingItem >()?.afterBattle(actor, stack, data)
77+ actor.entity?.inventory?.items?.filter { a -> a.item is PostBattleUpdatingItem }?.distinctBy { it.item }?.forEach { stack ->
78+ (stack.item as PostBattleUpdatingItem ).afterBattle(actor, stack, data)
79+ }
80+
8681
8782 actor.pokemonList.asSequence().map { it.originalPokemon }.forEach { originalPokemon ->
8883 val it: ItemStack = originalPokemon.heldItem()
0 commit comments