Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update from upstream SpigotMC

Browse Source 
3beb7729816
a77ed5758a7
52c130fc6d9
This commit is contained in:
Zach Brown
2014-12-20 19:09:49 -06:00
parent 5460c17f8a
commit c7f1eed0bf
187 changed files with 251 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CraftBukkit-Patches/0061-Particle-API.patch
View File

@@ -1,4 +1,4 @@
From 5e3d4b590b7f29e7f161c14ba275b9a8f99ed426 Mon Sep 17 00:00:00 2001
From 71ef235ee356c1c2074c85720447540de1e368b4 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API
@@ -132,10 +132,21 @@ index 3b660ff..eeb1ecb 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 2841e94..005d20f 100644
index 2841e94..ce16883 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1346,6 +1346,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -322,9 +322,7 @@ 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
@@ -1346,6 +1344,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
}
}