diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ac60d3d8..c0f2aef43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.2.22 +- fixed crash for flight sound + # 1.2.21 - Fixed more getChunk methods, they were in tardis flight code, should help with the performance diff --git a/gradle.properties b/gradle.properties index 06ab926f9..80b4f0f19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ yarn_mappings=1.20.1+build.10 loader_version=0.15.3 # Mod Properties -mod_version = 1.2.21-1.20.1-beta +mod_version = 1.2.22-1.20.1-beta maven_group = mdteam.ait archives_base_name = ait diff --git a/src/main/java/mdteam/ait/client/sounds/PositionedLoopingSound.java b/src/main/java/mdteam/ait/client/sounds/PositionedLoopingSound.java index 4a0f6fd92..4701b0124 100644 --- a/src/main/java/mdteam/ait/client/sounds/PositionedLoopingSound.java +++ b/src/main/java/mdteam/ait/client/sounds/PositionedLoopingSound.java @@ -9,7 +9,6 @@ public class PositionedLoopingSound extends LoopingSound { public PositionedLoopingSound(SoundEvent soundEvent, SoundCategory soundCategory, BlockPos pos, float volume, float pitch) { super(soundEvent, soundCategory); - this.x = pos.getX(); this.y = pos.getY(); this.z = pos.getZ(); diff --git a/src/main/java/mdteam/ait/client/sounds/flight/ClientFlightHandler.java b/src/main/java/mdteam/ait/client/sounds/flight/ClientFlightHandler.java index bd45a71ec..4ae3756ff 100644 --- a/src/main/java/mdteam/ait/client/sounds/flight/ClientFlightHandler.java +++ b/src/main/java/mdteam/ait/client/sounds/flight/ClientFlightHandler.java @@ -23,6 +23,7 @@ public class ClientFlightHandler extends SoundHandler { protected ClientFlightHandler() {} public LoopingSound getFlightLoop() { + if (tardis().getDesktop().getConsolePos() == null) return null; if (FLIGHT == null) FLIGHT = new FlightSound(AITSounds.FLIGHT_LOOP, SoundCategory.BLOCKS, tardis().getDesktop().getConsolePos(), 2.5f); // should this be positioned at the console pos or global? return FLIGHT;