Update from upstream SpigotMC

3beb7729816
a77ed5758a7
52c130fc6d9
This commit is contained in:
Zach Brown
2014-12-20 19:09:49 -06:00
parent 73bc2489c0
commit a9b3e95f53
7 changed files with 19 additions and 11 deletions

View File

@@ -135,6 +135,17 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void playEffect(Location loc, Effect effect, int data) {
if (getHandle().playerConnection == null) return;
- int packetData = effect.getId();
- PacketPlayOutWorldEvent packet = new PacketPlayOutWorldEvent(packetData, new BlockPosition(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()), data, false);
- getHandle().playerConnection.sendPacket(packet);
+ spigot().playEffect(loc, effect, data, 0, 0, 0, 0, 1, 1, Integer.MAX_VALUE);
}
@Override
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
}