diff --git a/src/main/java/ru/betterend/blocks/basis/PedestalBlock.java b/src/main/java/ru/betterend/blocks/basis/PedestalBlock.java index 81407855..8d79e82f 100644 --- a/src/main/java/ru/betterend/blocks/basis/PedestalBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/PedestalBlock.java @@ -435,7 +435,12 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock { @Override @Nullable public BlockEntityTicker getTicker(Level level, BlockState blockState, BlockEntityType blockEntityType) { - return level.isClientSide() ? null : createTickerHelper(blockEntityType, EndBlockEntities.PEDESTAL, PedestalBlockEntity::tick); + if (level.isClientSide) return null; + + BlockEntityTicker ticker = createTickerHelper(blockEntityType, EndBlockEntities.PEDESTAL, PedestalBlockEntity::tick); + if (ticker!=null) return ticker; + + return createTickerHelper(blockEntityType, EndBlockEntities.INFUSION_PEDESTAL, InfusionPedestalEntity::tick); } @Nullable diff --git a/src/main/java/ru/betterend/blocks/entities/InfusionPedestalEntity.java b/src/main/java/ru/betterend/blocks/entities/InfusionPedestalEntity.java index b13054dc..924c2af7 100644 --- a/src/main/java/ru/betterend/blocks/entities/InfusionPedestalEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/InfusionPedestalEntity.java @@ -44,13 +44,12 @@ public class InfusionPedestalEntity extends PedestalBlockEntity { public boolean hasRitual() { return linkedRitual != null; } - - @Override - protected void tick(Level tickLevel, BlockPos tickPos, BlockState tickState){ - if (hasRitual()) { - linkedRitual.tick(); + + public static void tick(Level tickLevel, BlockPos tickPos, BlockState tickState, InfusionPedestalEntity blockEntity) { + if (blockEntity.hasRitual()) { + blockEntity.linkedRitual.tick(); } - super.tick(tickLevel, tickPos, tickState); + PedestalBlockEntity.tick(tickLevel, tickPos, tickState, blockEntity); } @Override diff --git a/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java index c7668f2d..27dd586e 100644 --- a/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java @@ -132,16 +132,12 @@ public class PedestalBlockEntity extends BlockEntity implements Container, Block } } - protected void tick(Level tickLevel, BlockPos tickPos, BlockState tickState){ - if (!this.isEmpty()) { - this.age++; - if (this.age > this.maxAge) { - this.age = 0; + public static void tick(Level tickLevel, BlockPos tickPos, BlockState tickState, PedestalBlockEntity blockEntity) { + if (!blockEntity.isEmpty()) { + blockEntity.age++; + if (blockEntity.age > blockEntity.maxAge) { + blockEntity.age = 0; } } } - - public static void tick(Level tickLevel, BlockPos tickPos, BlockState tickState, PedestalBlockEntity blockEntity) { - blockEntity.tick(tickLevel, tickPos, tickState); - } }