summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/bukkit
diff options
context:
space:
mode:
authorsk89q <the.sk89q@gmail.com>2011-06-09 22:57:32 -0700
committersk89q <the.sk89q@gmail.com>2011-06-09 22:57:32 -0700
commit846bd468d4e93937a4604324363e4e7269e9bf54 (patch)
tree6d0506a495b5949404937a4407ccb1f2e9b91bca /src/main/java/org/bukkit
parentbaf9a9f50141baf04f5fe2cbff32607943394312 (diff)
downloadcraftbukkit-846bd468d4e93937a4604324363e4e7269e9bf54.tar
craftbukkit-846bd468d4e93937a4604324363e4e7269e9bf54.tar.gz
craftbukkit-846bd468d4e93937a4604324363e4e7269e9bf54.tar.lz
craftbukkit-846bd468d4e93937a4604324363e4e7269e9bf54.tar.xz
craftbukkit-846bd468d4e93937a4604324363e4e7269e9bf54.zip
Changed sound playing to effect dispatching, since these seem more like more like encompassing effect than mere sounds.
Diffstat (limited to 'src/main/java/org/bukkit')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftWorld.java14
1 files 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 4fa939de..60d4f6f4 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()) {