From 2181cdb4ef3878e8f9b847033f734cef078dd7c6 Mon Sep 17 00:00:00 2001 From: lion Date: Mon, 23 Dec 2024 09:24:36 +0000 Subject: [PATCH] =?UTF-8?q?Fix=20shiny=20pasture=20Pok=C3=A9mon=20playing?= =?UTF-8?q?=20the=20shiny=20effect=20incorrectly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mod/common/entity/pokemon/PokemonServerDelegate.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt index 695f01f156..21cfe9f532 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt @@ -107,8 +107,7 @@ class PokemonServerDelegate : PokemonSideDelegate { val trackedAspects = mock?.aspects ?: entity.pokemon.aspects val trackedBall = mock?.pokeball ?: entity.pokemon.caughtBall.name.toString() - //used getOwnerPlayer().uuid instead of getOwnerUUID() to avoid a potential NPE - entity.ownerUUID = entity.pokemon.getOwnerPlayer()?.uuid + entity.ownerUUID = entity.pokemon.getOwnerUUID() entity.entityData.set(PokemonEntity.SPECIES, trackedSpecies) if (entity.entityData.get(PokemonEntity.NICKNAME) != trackedNickname) { entity.entityData.set(PokemonEntity.NICKNAME, trackedNickname)