Skip to content

Commit b804dcd

Browse files
committed
item stack: don't use nullable operator
Its not nullable anymore
1 parent e5576f8 commit b804dcd

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

src/main/java/de/bixilon/minosoft/data/container/equipment/EntityEquipment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class EntityEquipment(
5454
if (enchantment is SlotSpecificEnchantment && !enchantment.canApply(entity, slot, item)) {
5555
continue
5656
}
57-
val level = item.enchanting?.enchantments?.get(enchantment) ?: continue
57+
val level = item.enchanting.enchantments[enchantment] ?: continue
5858
if (level > maxLevel) {
5959
maxLevel = level
6060
}

src/main/java/de/bixilon/minosoft/data/registries/item/items/weapon/attack/range/pullable/BowItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ open class BowItem(identifier: ResourceLocation = this.identifier) : RangeWeapon
3636
// infinite arrows
3737
return LongUseResults.START
3838
}
39-
if (stack.enchanting?.enchantments?.get(WeaponEnchantment.Infinity) != null) {
39+
if (stack.enchanting.enchantments[WeaponEnchantment.Infinity] != null) {
4040
return LongUseResults.START
4141
}
4242
// TODO: check if player has arrows

src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/item/ItemInfoPopper.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ class ItemInfoPopper(
6262
text += line
6363
}
6464
}
65-
stack.enchanting?.enchantments?.let {
66-
if (it.isEmpty()) return@let
65+
stack.enchanting.enchantments.takeIf { it.isNotEmpty() }?.let {
6766
text += "\n"
6867
val language = context.session.language
6968
for ((enchantment, level) in it) {

0 commit comments

Comments
 (0)