Skip to content

Commit b36d511

Browse files
committed
Fix JadeOrb quirks hopefully.
1 parent 6fa2a24 commit b36d511

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/legends/ElementalPostBattleUpdateItemImplImpl.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ open class ElementalPostBattleUpdateItemImplImpl(
1616
properties: Properties,
1717
private val lang: String = DEFAULT_LANG_KEY,
1818
private val key: SpeciesKey,
19-
private val itemToGiveUponSpawn : Holder<Item>? = null,
2019
types: List<ElementalType> = listOf()
2120
) : ElementalPostBattleUpdateItemImpl(properties, types) {
2221

2322
override fun use(level: Level, player: Player, usedHand: InteractionHand): InteractionResultHolder<ItemStack> {
2423
val stack = player.getItemInHand(usedHand)
2524

26-
if (!level.isClientSide()) {
25+
if (!level.isClientSide() && player.y >= 240.0) {
26+
2727
val damage = stack.damageValue
2828

2929
if (damage >= stack.maxDamage) {
3030
PokemonUtil.spawn(key.createProperties(70), level, player.onPos)
31-
postSpawn(level, player, usedHand)
31+
stack.consume(1, player)
3232
} else {
3333
player.displayClientMessage(Component.translatable(lang, stack.maxDamage - damage), true)
3434
}
@@ -39,10 +39,6 @@ open class ElementalPostBattleUpdateItemImplImpl(
3939
return InteractionResultHolder.pass(stack)
4040
}
4141

42-
protected fun postSpawn(level: Level, player: Player, usedHand: InteractionHand) {
43-
itemToGiveUponSpawn?.value()?.defaultInstance?.let { player.setItemInHand(usedHand, it) }
44-
}
45-
4642
companion object {
4743
const val DEFAULT_LANG_KEY: String = "generations_core.orb.amountfull"
4844
}

0 commit comments

Comments
 (0)