From e77c6bff2ea9740fc304cfb6ea75861cbe71696a Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Thu, 16 Apr 2020 12:17:12 -0400 Subject: [PATCH] 1.0.24 Fix Teleportation Restrictor only affecting living entities --- CHANGELOG.md | 3 +++ gradle.properties | 2 +- .../reliccraft/block/AbstractDragonEggHolderBlock.java | 6 +----- .../reliccraft/block/TeleportationRestrictorBlock.java | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbcce99..d925981 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +**1.0.24** +* Fix Teleportation Restrictor only affecting living entities + **1.0.23** * Remove Max Count Limit From The Creative Relic Generator diff --git a/gradle.properties b/gradle.properties index 7417cea..4355ec6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs = -Xmx1G fabric_loader_version = 0.7.10+build.191 # Mod Properties - mod_version = 1.0.23 + mod_version = 1.0.24 maven_group = com.thebrokenrail archives_base_name = reliccraft diff --git a/src/main/java/com/thebrokenrail/reliccraft/block/AbstractDragonEggHolderBlock.java b/src/main/java/com/thebrokenrail/reliccraft/block/AbstractDragonEggHolderBlock.java index 76d3518..b873087 100644 --- a/src/main/java/com/thebrokenrail/reliccraft/block/AbstractDragonEggHolderBlock.java +++ b/src/main/java/com/thebrokenrail/reliccraft/block/AbstractDragonEggHolderBlock.java @@ -53,11 +53,7 @@ public abstract class AbstractDragonEggHolderBlock extends Block implements Bloc ItemStack stack = user.getStackInHand(hand); if (inventory.isValidInvStack(0, stack) && inventory.getInvStack(0).isEmpty()) { - if (user.isCreative()) { - inventory.setInvStack(0, stack.copy().split(1)); - } else { - inventory.setInvStack(0, stack.split(1)); - } + inventory.setInvStack(0, stack.split(1)); if (!world.isClient()) { grantAdvancement(user); diff --git a/src/main/java/com/thebrokenrail/reliccraft/block/TeleportationRestrictorBlock.java b/src/main/java/com/thebrokenrail/reliccraft/block/TeleportationRestrictorBlock.java index 4cfc0e0..3a9039c 100644 --- a/src/main/java/com/thebrokenrail/reliccraft/block/TeleportationRestrictorBlock.java +++ b/src/main/java/com/thebrokenrail/reliccraft/block/TeleportationRestrictorBlock.java @@ -4,7 +4,7 @@ import com.thebrokenrail.reliccraft.RelicCraft; import net.fabricmc.fabric.api.block.FabricBlockSettings; import net.minecraft.block.Material; import net.minecraft.block.MaterialColor; -import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Inventory; import net.minecraft.server.network.ServerPlayerEntity; @@ -29,8 +29,8 @@ public class TeleportationRestrictorBlock extends AbstractDragonEggHolderBlock { public void tick(World world, BlockPos pos, Inventory inventory) { int radius = !inventory.getInvStack(0).isEmpty() ? 128 : 0; Box box = new Box(pos).expand(radius); - List list = world.getNonSpectatingEntities(LivingEntity.class, box); - for (LivingEntity entity : list) { + List list = world.getNonSpectatingEntities(Entity.class, box); + for (Entity entity : list) { ((TeleportingEntity) entity).resetTeleportCooldown(); } }