MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed Tick for InfusionPedestal

Browse source
This commit is contained in:
Frank Bauer 2021-06-29 23:05:36 +02:00
parent b6c4e73481
commit ab6d015c98
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/ru/betterend/blocks/basis/PedestalBlock.java
View file

@ -435,7 +435,12 @@ public class PedestalBlock extends BaseBlockNotFull implements EntityBlock {
@Override @Override
@Nullable @Nullable
public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState blockState, BlockEntityType<T> blockEntityType) { public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState blockState, BlockEntityType<T> blockEntityType) {
return level.isClientSide() ? null : createTickerHelper(blockEntityType, EndBlockEntities.PEDESTAL, PedestalBlockEntity::tick); if (level.isClientSide) return null;
BlockEntityTicker<T> ticker = createTickerHelper(blockEntityType, EndBlockEntities.PEDESTAL, PedestalBlockEntity::tick);
if (ticker!=null) return ticker;
return createTickerHelper(blockEntityType, EndBlockEntities.INFUSION_PEDESTAL, InfusionPedestalEntity::tick);
} }
@Nullable @Nullable

9
src/main/java/ru/betterend/blocks/entities/InfusionPedestalEntity.java
View file

@ -45,12 +45,11 @@ public class InfusionPedestalEntity extends PedestalBlockEntity {
return linkedRitual != null; return linkedRitual != null;
} }
@Override public static void tick(Level tickLevel, BlockPos tickPos, BlockState tickState, InfusionPedestalEntity blockEntity) {
protected void tick(Level tickLevel, BlockPos tickPos, BlockState tickState){ if (blockEntity.hasRitual()) {
if (hasRitual()) { blockEntity.linkedRitual.tick();
linkedRitual.tick();
} }
super.tick(tickLevel, tickPos, tickState); PedestalBlockEntity.tick(tickLevel, tickPos, tickState, blockEntity);
} }
@Override @Override

16
src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java
View file

@ -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) { public static void tick(Level tickLevel, BlockPos tickPos, BlockState tickState, PedestalBlockEntity blockEntity) {
blockEntity.tick(tickLevel, tickPos, tickState); if (!blockEntity.isEmpty()) {
blockEntity.age++;
if (blockEntity.age > blockEntity.maxAge) {
blockEntity.age = 0;
}
}
} }
} }