Skip to content

Commit 23d7d85

Browse files
committed
Riding offset adjustment, Lunar Shrine
1 parent 789713b commit 23d7d85

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

CHANGELOG.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# 1.2.5
22

3-
Additions
3+
### Additions
44
-
55

6-
Changes
6+
### Changes
77
-
88

9-
Bug Fixes
9+
### Bug Fixes
10+
- Adjusted default sitting position offset slightly, until we can get this properly scaled per Pokemon JSON
1011
- Fixed Hoopa Unbound Prison Bottle form change
12+
- Fixed Lunar Shrine summon eating from your hand
1113

1214

1315
# 1.2.4

common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/RareCandyBone.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,11 @@ class RareCandyBone /*Remove when cobblemon doesn't have parts of code that assu
117117
override fun get(): Bone = this
118118

119119
companion object {
120-
private val MAP = mapOf(PREFIX + "seat_1" to ModelPart(mutableListOf(), mapOf()))
120+
private val MAP = mapOf(
121+
PREFIX + "seat_1" to ModelPart(mutableListOf(), mapOf()).also {
122+
it.setPos(0f, -35f, 0f)
123+
}
124+
)
121125
private val ROTATION_CORRECTION = Axis.YP.rotationDegrees(180f)
122126
}
123127
}

common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/LunarShrineBlock.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class LunarShrineBlock(properties: Properties) : ShrineBlock(properties = proper
8787
if (list.isNotEmpty() && shrine != null) {
8888
if (list.size == 5) {
8989
list.forEach(Consumer { a -> level.destroyBlock(a, false) })
90-
player.getItemInHand(hand).shrink(1)
90+
// player.getItemInHand(hand).shrink(1)
9191
PokemonUtil.spawn(key.createProperties(70), level, shrine.blockPos.above())
9292

9393
return ItemInteractionResult.SUCCESS

0 commit comments

Comments
 (0)