Skip to content

Commit

Permalink
Merge branch '1.19' into 1.20
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/kotlin/io/github/lucaargolo/kibe/items/miscellaneous/Lasso.kt
  • Loading branch information
lucaargolo committed Jul 16, 2023
2 parents c72f019 + 6a52137 commit 2e6e7e6
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ abstract class Lasso(settings: Settings): Item(settings) {

override fun useOnEntity(stack: ItemStack, user: PlayerEntity, entity: LivingEntity, hand: Hand): ActionResult {
if (stack.nbt == null || !stack.orCreateNbt.contains("Entity")) {
if (entity is MobEntity && canStoreEntity(entity.type) && MOD_CONFIG.miscellaneousModule.lassoDenyList.contains(Registries.ENTITY_TYPE.getId(entity.type).toString())) {
if (entity is MobEntity && canStoreEntity(entity.type) && !MOD_CONFIG.miscellaneousModule.lassoDenyList.contains(Registries.ENTITY_TYPE.getId(entity.type).toString())) {
if(!user.world.isClient) {
if (entity.isLeashed) entity.detachLeash(true, true)
entity.fallDistance = 0f
Expand Down

0 comments on commit 2e6e7e6

Please sign in to comment.