Fix Barrier entity causing server side launch crash

ZsoltMolnarrr · Mar 31, 2024 · cb1172d · cb1172d
1 parent ea0bb3c
commit cb1172d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.1.2
+
+- Fix Barrier entity causing server side launch crash
+
 # 1.1.1
 
 - Fix Aeternium claymore texture gaps

diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ fabric_api_version=0.87.0+1.20.1
 # Mod
 maven_group=net
 archives_base_name=paladins
-mod_version=1.1.1
+mod_version=1.1.2
 
 # Dependencies
 trinkets_version=3.7.2

diff --git a/src/main/java/net/paladins/entity/BarrierEntity.java b/src/main/java/net/paladins/entity/BarrierEntity.java
@@ -18,6 +18,7 @@
 import net.spell_engine.api.entity.TwoWayCollisionChecker;
 import net.spell_engine.api.spell.Spell;
 import net.spell_engine.internals.SpellRegistry;
+import net.spell_engine.utils.SoundPlayerWorld;
 import net.spell_engine.utils.TargetHelper;
 import org.jetbrains.annotations.Nullable;
 
@@ -170,12 +171,11 @@ public void tick() {
         if (spell == null) {
             return;
         }
-        if (this.getWorld().isClient()) {
+        var world = this.getWorld();
+        if (world.isClient()) {
             // Client
             if (!idleSoundFired) {
-                var clientWorld = (ClientWorld) this.getWorld();
-                var player = MinecraftClient.getInstance().player;
-                clientWorld.playSoundFromEntity(player, this, idleSound, SoundCategory.PLAYERS, 1F, 1F);
+                ((SoundPlayerWorld)world).playSoundFromEntity(this, idleSound, SoundCategory.PLAYERS, 1F, 1F);
                 idleSoundFired = true;
             }
         } else {