mirrors/cobblemon
1
0
Fork 1
mirror of https://gitlab.com/cable-mc/cobblemon.git synced 2026-10-27 04:26:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-pasture-shiny-effect' into 'main'

Browse Source 
Fix shiny pasture Pokémon playing the shiny effect incorrectly

Closes #1257

See merge request cable-mc/cobblemon!1409
This commit is contained in:
Hiroku
2024-12-23 09:24:36 +00:00
parent 2a293def4f 2181cdb4ef
commit bcdbb19a75
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt
+1 -2
View File
@@ -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)