diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 85e55279f..3f2748c3d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1550,9 +1550,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public void playSound(Location loc, Sound sound, org.bukkit.SoundCategory category, float volume, float pitch) { - Preconditions.checkArgument(loc != null, "Location cannot be null"); - Preconditions.checkArgument(sound != null, "Sound cannot be null"); - Preconditions.checkArgument(category != null, "Category cannot be null"); + if (loc == null || sound == null || category == null) return; double x = loc.getX(); double y = loc.getY(); @@ -1563,9 +1561,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public void playSound(Location loc, String sound, org.bukkit.SoundCategory category, float volume, float pitch) { - Preconditions.checkArgument(loc != null, "Location cannot be null"); - Preconditions.checkArgument(sound != null, "Sound cannot be null"); - Preconditions.checkArgument(category != null, "Category cannot be null"); + if (loc == null || sound == null || category == null) return; double x = loc.getX(); double y = loc.getY(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 08c4025aa..30fe9e007 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -747,7 +747,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @Override public void setTicksLived(int value) { - Preconditions.checkArgument(value > 0, "Age value (%s) must be positive", value); + Preconditions.checkArgument(value > 0, "Age value (%s) must be greater than 0", value); getHandle().tickCount = value; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 6eb60cab5..ec5133ae8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -457,16 +457,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void playSound(Location loc, Sound sound, org.bukkit.SoundCategory category, float volume, float pitch) { - Preconditions.checkArgument(sound != null, "Sound cannot be null"); - Preconditions.checkArgument(category != null, "Category cannot be null"); + if (loc == null || sound == null || category == null || getHandle().connection == null) return; playSound0(loc, BuiltInRegistries.SOUND_EVENT.wrapAsHolder(CraftSound.getSoundEffect(sound)), net.minecraft.sounds.SoundCategory.valueOf(category.name()), volume, pitch); } @Override public void playSound(Location loc, String sound, org.bukkit.SoundCategory category, float volume, float pitch) { - Preconditions.checkArgument(sound != null, "sound cannot be null"); - Preconditions.checkArgument(category != null, "Category cannot be null"); + if (loc == null || sound == null || category == null || getHandle().connection == null) return; playSound0(loc, Holder.direct(SoundEffect.createVariableRangeEvent(new MinecraftKey(sound))), net.minecraft.sounds.SoundCategory.valueOf(category.name()), volume, pitch); } @@ -492,16 +490,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void playSound(org.bukkit.entity.Entity entity, Sound sound, org.bukkit.SoundCategory category, float volume, float pitch) { - Preconditions.checkArgument(category != null, "Category cannot be null"); - Preconditions.checkArgument(sound != null, "Sound cannot be null"); + if (!(entity instanceof CraftEntity craftEntity) || sound == null || category == null || getHandle().connection == null) return; playSound0(entity, BuiltInRegistries.SOUND_EVENT.wrapAsHolder(CraftSound.getSoundEffect(sound)), net.minecraft.sounds.SoundCategory.valueOf(category.name()), volume, pitch); } @Override public void playSound(org.bukkit.entity.Entity entity, String sound, org.bukkit.SoundCategory category, float volume, float pitch) { - Preconditions.checkArgument(category != null, "Category cannot be null"); - Preconditions.checkArgument(sound != null, "sound cannot be null"); + if (!(entity instanceof CraftEntity craftEntity) || sound == null || category == null || getHandle().connection == null) return; playSound0(entity, Holder.direct(SoundEffect.createVariableRangeEvent(new MinecraftKey(sound))), net.minecraft.sounds.SoundCategory.valueOf(category.name()), volume, pitch); } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java index 6fa6df14e..b2a56e88f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -84,7 +84,7 @@ public class CraftInventory implements Inventory { @Override public void setContents(ItemStack[] items) { - Preconditions.checkArgument(getSize() < items.length, "Invalid inventory size (%s); expected %s or less", items.length, getSize()); + Preconditions.checkArgument(items.length <= getSize(), "Invalid inventory size (%s); expected %s or less", items.length, getSize()); for (int i = 0; i < getSize(); i++) { if (i >= items.length) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java index 154f1837b..a27136d12 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java @@ -32,7 +32,7 @@ public class CraftInventoryCrafting extends CraftInventory implements CraftingIn @Override public void setContents(ItemStack[] items) { - Preconditions.checkArgument(getSize() <= items.length, "Invalid inventory size (%s); expected %s or less", items.length, getSize()); + Preconditions.checkArgument(items.length <= getSize(), "Invalid inventory size (%s); expected %s or less", items.length, getSize()); setContents(items[0], Arrays.copyOfRange(items, 1, items.length)); } @@ -96,7 +96,7 @@ public class CraftInventoryCrafting extends CraftInventory implements CraftingIn @Override public void setMatrix(ItemStack[] contents) { - Preconditions.checkArgument(getMatrixInventory().getContainerSize() <= contents.length, "Invalid inventory size (%s); expected %s or less", contents.length, getMatrixInventory().getContainerSize()); + Preconditions.checkArgument(contents.length <= getMatrixInventory().getContainerSize(), "Invalid inventory size (%s); expected %s or less", contents.length, getMatrixInventory().getContainerSize()); for (int i = 0; i < getMatrixInventory().getContainerSize(); i++) { if (i < contents.length) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java index 3ccfb1fbe..4caa7c0f7 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java @@ -48,7 +48,7 @@ public class CraftInventoryDoubleChest extends CraftInventory implements DoubleC @Override public void setContents(ItemStack[] items) { - Preconditions.checkArgument(getInventory().getContainerSize() >= items.length, "Invalid inventory size (%s); expected %s or less", items.length, getInventory().getContainerSize()); + Preconditions.checkArgument(items.length <= getInventory().getContainerSize(), "Invalid inventory size (%s); expected %s or less", items.length, getInventory().getContainerSize()); ItemStack[] leftItems = new ItemStack[left.getSize()], rightItems = new ItemStack[right.getSize()]; System.arraycopy(items, 0, leftItems, 0, Math.min(left.getSize(), items.length)); left.setContents(leftItems);