diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java
index 127c4381e..ba9d11d8a 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java
@@ -74,7 +74,7 @@ public class CommandIrisObjectContract extends MortarCommand {
         b[1] = cursor.getUpperSW();
         p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
         p.updateInventory();
-        p.playSound(p.getLocation(), Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
+        sender.playSound(Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
 
         return true;
     }
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java
index 106c372fe..de6e919f7 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java
@@ -74,7 +74,7 @@ public class CommandIrisObjectExpand extends MortarCommand {
         b[1] = cursor.getUpperSW();
         p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
         p.updateInventory();
-        p.playSound(p.getLocation(), Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
+        sender.playSound(Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
 
         return true;
     }
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java
index 958d2cff1..9dab1b2ab 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java
@@ -174,7 +174,7 @@ public class CommandIrisObjectPaste extends MortarCommand {
 
         Iris.debug("Loaded object for placement: " + "objects/" + args[0] + ".iob");
 
-        sender.player().getWorld().playSound(sender.player().getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
+        sender.playSound(Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
 
         Set<Material> skipBlocks = Set.of(Material.GRASS, Material.SNOW, Material.VINE, Material.TORCH, Material.DEAD_BUSH,
                 Material.POPPY, Material.DANDELION);
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java
index a5dc75080..73c4ae88c 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java
@@ -88,7 +88,7 @@ public class CommandIrisObjectSave extends MortarCommand {
 
             o.write(file);
             sender.sendMessage("Saved " + args[1]);
-            p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
+            sender.playSound(Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
         } catch (Throwable e) {
             Iris.reportError(e);
             sender.sendMessage("Failed to save " + args[1] + ". Are you holding your wand?");
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSaveMatter.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSaveMatter.java
index 45a599486..4824d0972 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSaveMatter.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSaveMatter.java
@@ -88,7 +88,7 @@ public class CommandIrisObjectSaveMatter extends MortarCommand {
 
             o.write(file);
             sender.sendMessage("Saved " + args[1]);
-            p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
+            sender.playSound(Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
         } catch (Throwable e) {
             Iris.reportError(e);
             sender.sendMessage("Failed to save " + args[1] + ". Are you holding your wand?");
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java
index e106704e6..46c605970 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java
@@ -75,7 +75,7 @@ public class CommandIrisObjectShift extends MortarCommand {
         b[1] = cursor.getUpperSW();
         p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
         p.updateInventory();
-        p.playSound(p.getLocation(), Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
+        sender.playSound(Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
 
         return true;
     }
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java
index 3c3a65f98..e048d2ff5 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java
@@ -101,7 +101,7 @@ public class CommandIrisObjectXAY extends MortarCommand {
         b[1] = cursor.getUpperSW();
         p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
         p.updateInventory();
-        p.playSound(p.getLocation(), Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
+        sender.playSound(Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
 
         return true;
     }
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java
index 1ec4fc96d..beeb4c4bb 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java
@@ -89,7 +89,7 @@ public class CommandIrisObjectXPY extends MortarCommand {
         b[1] = cursor.getUpperSW();
         p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
         p.updateInventory();
-        p.playSound(p.getLocation(), Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
+        sender.playSound(Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
 
         return true;
     }
diff --git a/src/main/java/com/volmit/iris/core/decrees/DecObject.java b/src/main/java/com/volmit/iris/core/decrees/DecObject.java
index dfc7af2b2..f31da5ece 100644
--- a/src/main/java/com/volmit/iris/core/decrees/DecObject.java
+++ b/src/main/java/com/volmit/iris/core/decrees/DecObject.java
@@ -196,7 +196,7 @@ public class DecObject implements DecreeExecutor {
 
         IrisObjectPlacement placement = new IrisObjectPlacement();
         placement.setRotation(IrisObjectRotation.of(0, rotate, 0));
-        sender().player().getWorld().playSound(sender().player().getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
+        sender().playSound(Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
 
     }
 
diff --git a/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java b/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java
index d3f5decdf..f941eb9a7 100644
--- a/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java
+++ b/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java
@@ -100,8 +100,8 @@ public abstract class MortarCommand implements ICommand {
         }
 
         if (sender.isPlayer() && IrisSettings.get().getGeneral().isCommandSounds()) {
-            sender.player().getWorld().playSound(sender.player().getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.28f, 1.4f);
-            sender.player().getWorld().playSound(sender.player().getLocation(), Sound.ITEM_AXE_STRIP, 0.35f, 1.7f);
+            sender.playSound(Sound.ITEM_BOOK_PAGE_TURN, 0.28f, 1.4f);
+            sender.playSound(Sound.ITEM_AXE_STRIP, 0.35f, 1.7f);
         }
     }