Merge remote-tracking branch 'Gordon-Frohman/master' into dev

GTNewHorizons · May 29, 2024 · 45af289 · 45af289
2 parents 28d3838 + c3bc4ef
commit 45af289
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/main/java/twilightforest/block/BlockTFCicada.java b/src/main/java/twilightforest/block/BlockTFCicada.java
@@ -10,8 +10,6 @@
 import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import twilightforest.tileentity.TileEntityTFCicada;
 
 public class BlockTFCicada extends BlockTFCritter {
@@ -80,16 +78,17 @@ public boolean onBlockActivated(World worldIn, int x, int y, int z, EntityPlayer
         return false;
     }
 
-    @SideOnly(Side.CLIENT)
     public void stopSinging(World worldIn, int x, int y, int z) {
-        ChunkCoordinates chunkcoordinates = new ChunkCoordinates(x, y, z);
-        Minecraft mc = Minecraft.getMinecraft();
-        ISound isound = (ISound) mc.renderGlobal.mapSoundPositions.get(chunkcoordinates);
+        if (worldIn.isRemote) {
+            ChunkCoordinates chunkcoordinates = new ChunkCoordinates(x, y, z);
+            Minecraft mc = Minecraft.getMinecraft();
+            ISound isound = (ISound) mc.renderGlobal.mapSoundPositions.get(chunkcoordinates);
 
-        while (isound != null) {
-            mc.getSoundHandler().stopSound(isound);
-            mc.renderGlobal.mapSoundPositions.remove(chunkcoordinates);
-            isound = (ISound) mc.renderGlobal.mapSoundPositions.get(chunkcoordinates);
+            while (isound != null) {
+                mc.getSoundHandler().stopSound(isound);
+                mc.renderGlobal.mapSoundPositions.remove(chunkcoordinates);
+                isound = (ISound) mc.renderGlobal.mapSoundPositions.get(chunkcoordinates);
+            }
         }
     }