diff --git a/src/main/java/ru/betterend/blocks/BlockRespawnObelisk.java b/src/main/java/ru/betterend/blocks/BlockRespawnObelisk.java index 5560afbb..8a315450 100644 --- a/src/main/java/ru/betterend/blocks/BlockRespawnObelisk.java +++ b/src/main/java/ru/betterend/blocks/BlockRespawnObelisk.java @@ -15,6 +15,7 @@ import net.minecraft.client.color.block.BlockColorProvider; import net.minecraft.client.color.item.ItemColorProvider; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; import net.minecraft.server.network.ServerPlayerEntity; @@ -158,11 +159,15 @@ public class BlockRespawnObelisk extends BlockBase implements IColorProvider, IR ItemStack itemStack = player.getStackInHand(hand); boolean canActivate = itemStack.getItem() == EndItems.AMBER_GEM && itemStack.getCount() > 3; if (hand != Hand.MAIN_HAND || !canActivate) { + if (!world.isClient && !(itemStack.getItem() instanceof BlockItem)) { + ServerPlayerEntity serverPlayerEntity = (ServerPlayerEntity) player; + serverPlayerEntity.sendMessage(new TranslatableText("message.betterend.fail_spawn"), true); + } return ActionResult.FAIL; } if (!world.isClient) { ServerPlayerEntity serverPlayerEntity = (ServerPlayerEntity) player; - serverPlayerEntity.setSpawnPoint(world.getRegistryKey(), pos, 0.0F, false, true); + serverPlayerEntity.setSpawnPoint(world.getRegistryKey(), pos, 0.0F, false, false); serverPlayerEntity.sendMessage(new TranslatableText("message.betterend.set_spawn"), true); world.playSound(null, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, SoundEvents.BLOCK_RESPAWN_ANCHOR_SET_SPAWN, SoundCategory.BLOCKS, 1.0F, 1.0F); if (!player.isCreative()) { diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 866899e7..bfba95d5 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -473,5 +473,8 @@ "block.betterend.bulb_moss": "Bulb Moss", "block.betterend.charnia_green": "Charnia Green", - "block.betterend.vent_bubble_column": "Vent Bubble Column" + "block.betterend.vent_bubble_column": "Vent Bubble Column", + "block.betterend.respawn_obelisk": "Respawn Obelisk", + "message.betterend.set_spawn": "\u00A7b\u00A7lYour spawn point is set here", + "message.betterend.fail_spawn": "\u00A7c\u00A7lYour need to hold 4 Amber Gems to set your spawn point" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 4379f36f..a68295af 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -475,5 +475,8 @@ "block.betterend.bulb_moss": "Луковичный мох", "block.betterend.charnia_green": "Зелёная чарния", - "block.betterend.vent_bubble_column": "Колонна пузырьков гейзера" + "block.betterend.vent_bubble_column": "Колонна пузырьков гейзера", + "block.betterend.respawn_obelisk": "Обелиск возрождения", + "message.betterend.set_spawn": "\u00A7b\u00A7lВаша точка возрождения установлена здесь", + "message.betterend.fail_spawn": "\u00A7c\u00A7lДержите 4 штуки огранённого янтаря для установки точки возрождения" } \ No newline at end of file