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

Update from upstream SpigotMC

Browse Source 
44608631338 [M]
29dbaa783fe
edf691c2e93
da9bbdfaea9
330d66bfb62
This commit is contained in:
Zach Brown
2014-12-10 22:21:51 -06:00
parent 8326a255d5
commit 690205b676
22 changed files with 112 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 454b3b83ea995cce9695a0bad2f36699c941a295 Mon Sep 17 00:00:00 2001
From 0275b4cfc6008da7830d21bc7e69bbe41a5eeada 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
@@ -19,7 +19,7 @@ index 7de0de5..13f9e9d 100644
datavalue = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 13f85d5..e395704 100644
index 568072f..cc6c003 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -811,28 +811,18 @@ public class CraftWorld implements World {
@@ -91,7 +91,7 @@ index 13f85d5..e395704 100644
+ extra = new int[]{ id };
+ } else
+ {
+ extra = new int[]{ (id << 4) | data };
+ extra = new int[]{ (data << 12) | (id & 0xFFF) };
+ }
+ }
+ break;
@@ -132,7 +132,7 @@ index 13f85d5..e395704 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 a05f656..bec510a 100644
index a05f656..141391a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1343,6 +1343,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -167,7 +167,7 @@ index a05f656..bec510a 100644
+ extra = new int[]{ id };
+ } else
+ {
+ extra = new int[]{ (id << 4) | data };
+ extra = new int[]{ (data << 12) | (id & 0xFFF) };
+ }
+ }
+ break;