Fixed a few issues

TeamMetallurgy · Oct 26, 2020 · 1505e35 · 1505e35
1 parent ef7d98d
commit 1505e35
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 minecraft_version=1.16.3
-forge_version=34.1.23
+forge_version=34.1.25
 mappings=20200916-1.16.2
 mod_version=2.2.0
 jei_version=7.6.0.49

diff --git a/src/main/java/com/teammetallurgy/atum/blocks/stone/limestone/LimestoneBrickBlock.java b/src/main/java/com/teammetallurgy/atum/blocks/stone/limestone/LimestoneBrickBlock.java
@@ -53,7 +53,7 @@ public void onBlockPlacedBy(@Nonnull World world, @Nonnull BlockPos pos, @Nonnul
     @SubscribeEvent
     public static void onBlockBreak(BlockEvent.BreakEvent event) {
         BlockState state = event.getState();
-        if (state.getBlock() instanceof LimestoneBrickBlock && state.get(LimestoneBrickBlock.UNBREAKABLE)) {
+        if (state.getBlock() instanceof LimestoneBrickBlock && state.get(LimestoneBrickBlock.UNBREAKABLE) && !event.getPlayer().isCreative()) {
             event.setCanceled(true);
         }
     }

diff --git a/src/main/java/com/teammetallurgy/atum/blocks/trap/TrapBlock.java b/src/main/java/com/teammetallurgy/atum/blocks/trap/TrapBlock.java
@@ -50,7 +50,7 @@ public static void onBlockBreak(BlockEvent.BreakEvent event) {
         BlockState state = event.getState();
         if (state.getBlock() instanceof TrapBlock) {
             TileEntity tileEntity = event.getWorld().getTileEntity(event.getPos());
-            if (tileEntity instanceof TrapTileEntity && ((TrapTileEntity) tileEntity).isInsidePyramid) {
+            if (tileEntity instanceof TrapTileEntity && ((TrapTileEntity) tileEntity).isInsidePyramid && !event.getPlayer().isCreative()) {
                 event.setCanceled(true);
             }
         }

diff --git a/src/main/java/com/teammetallurgy/atum/blocks/wood/tileentity/crate/CrateTileEntity.java b/src/main/java/com/teammetallurgy/atum/blocks/wood/tileentity/crate/CrateTileEntity.java
@@ -23,7 +23,7 @@
 
 import javax.annotation.Nonnull;
 
-public class CrateTileEntity extends InventoryBaseTileEntity implements ITickableTileEntity, IChestLid {
+public class CrateTileEntity extends InventoryBaseTileEntity implements ITickableTileEntity {
     private int ticksSinceSync;
     private int numPlayersUsing;
     public float lidAngle;
@@ -126,8 +126,6 @@ protected void onOpenOrClose() {
         }
     }
 
-    @Override
-    @OnlyIn(Dist.CLIENT)
     public float getLidAngle(float partialTicks) {
         return MathHelper.lerp(partialTicks, this.prevLidAngle, this.lidAngle);
     }

diff --git a/src/main/java/com/teammetallurgy/atum/entity/efreet/SunspeakerEntity.java b/src/main/java/com/teammetallurgy/atum/entity/efreet/SunspeakerEntity.java
@@ -95,7 +95,6 @@ public SunspeakerEntity(EntityType<? extends SunspeakerEntity> entityType, World
         super(entityType, world);
         ((GroundPathNavigator) this.getNavigator()).setBreakDoors(true);
         this.getNavigator().setCanSwim(true);
-        this.brain = this.createBrain(new Dynamic<>(NBTDynamicOps.INSTANCE, new CompoundNBT()));
         this.setItemStackToSlot(EquipmentSlotType.MAINHAND, new ItemStack(ScepterItem.getScepter(PharaohEntity.God.RA)));
         this.setSunspeakerData(this.getSunspeakerData().withLevel(0));
     }