From 846bd468d4e93937a4604324363e4e7269e9bf54 Mon Sep 17 00:00:00 2001 From: sk89q Date: Thu, 9 Jun 2011 22:57:32 -0700 Subject: [PATCH] Changed sound playing to effect dispatching, since these seem more like more like encompassing effect than mere sounds. --- .../java/org/bukkit/craftbukkit/CraftWorld.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 4fa939de4f..60d4f6f4f0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -11,7 +11,7 @@ import java.util.Random; import net.minecraft.server.*; import org.bukkit.entity.Arrow; -import org.bukkit.Sound; +import org.bukkit.Effect; import org.bukkit.event.weather.WeatherChangeEvent; import org.bukkit.event.weather.ThunderChangeEvent; import org.bukkit.event.world.SpawnChangeEvent; @@ -648,16 +648,16 @@ public class CraftWorld implements World { world.pvpMode = pvp; } - public void playSound(Player player, Sound sound, int data) { - playSound(player.getLocation(), sound, data, 0); + public void playEffect(Player player, Effect sound, int data) { + playEffect(player.getLocation(), sound, data, 0); } - public void playSound(Location location, Sound sound, int data) { - playSound(location, sound, data, 64); + public void playEffect(Location location, Effect sound, int data) { + playEffect(location, sound, data, 64); } - public void playSound(Location location, Sound sound, int data, int radius) { - int packetData = sound.getSoundIdentifier(); + public void playEffect(Location location, Effect sound, int data, int radius) { + int packetData = sound.getId(); Packet61 packet = new Packet61(packetData, location.getBlockX(), location.getBlockY(), location.getBlockZ(), data); int distance; for (Player player : getPlayers()) {