mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update from upstream SpigotMC

Browse source 
Make "moved too quickly" limit configurable SpigotMC/Spigot@99a0a640e8
Undeprecate Player#updateInventory()V SpigotMC/Spigot@5c32e1cb48
Fetch complete profile for skull items, similarly to TileEntitySkull. SpigotMC/Spigot@33d758773e
Move getDouble into the Spigot Configuration patch SpigotMC/Spigot@b5dd202af1
Add missing particle to particle API SpigotMC/Spigot@273c64bbad
Log debug levels to the log file. SpigotMC/Spigot@348eae75f4
Fix PlayerItemDamageEvent (we already had this #badupstreamrelations) SpigotMC/Spigot@e207ea23cd
Move hopper patch to top for PR180 SpigotMC/Spigot@abb775108d
Don't be so spammy on Java 6 SpigotMC/Spigot@5abb82b1ca
Apply NBTReadLimiter to more things SpigotMC/Spigot@408944e9f5
This commit is contained in:
Zach Brown 2014-07-27 14:14:24 -05:00
parent a7f1e7efd5
commit 398f6983bd
33 changed files with 506 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Bukkit-Patches/0006-Add-Particle-API.patch
View file

@ -1,11 +1,11 @@
From a6da83fdbd71c75c3fc298b878e723aaaab9ee18 Mon Sep 17 00:00:00 2001
From 2cc00cabffae84bcc74ee1c03a646dc92d012fbb Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:57:09 +1000
Subject: [PATCH] Add Particle API
diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
index 2474a2d..9964203 100644
index 2474a2d..37f29e2 100644
--- a/src/main/java/org/bukkit/Effect.java
+++ b/src/main/java/org/bukkit/Effect.java
@@ -5,6 +5,7 @@ import java.util.Map;
@ -16,7 +16,7 @@ index 2474a2d..9964203 100644
import org.bukkit.potion.Potion;
/**
@@ -79,27 +80,183 @@ public enum Effect {
@@ -79,27 +80,188 @@ public enum Effect {
/**
* The flames seen on a mobspawner; a visual effect.
*/
@ -147,6 +147,11 @@ index 2474a2d..9964203 100644
+ */
+ HAPPY_VILLAGER("happyVillager", Type.PARTICLE),
+ /**
+ * The smoke particles that appears on blazes, minecarts
+ * with furnaces and fire
+ */
+ LARGE_SMOKE("largesmoke", Type.PARTICLE),
+ /**
+ * The particles generated when a tool breaks.
+ * This particle requires a Material so that the client can select the correct texture.
+ */
@ -204,7 +209,7 @@ index 2474a2d..9964203 100644
* @deprecated Magic value
*/
@Deprecated
@@ -108,6 +265,15 @@ public enum Effect {
@@ -108,6 +270,15 @@ public enum Effect {
}
/**
@ -220,7 +225,7 @@ index 2474a2d..9964203 100644
* @return The type of the effect.
*/
public Type getType() {
@@ -115,8 +281,7 @@ public enum Effect {
@@ -115,8 +286,7 @@ public enum Effect {
}
/**
@ -230,7 +235,7 @@ index 2474a2d..9964203 100644
*/
public Class<?> getData() {
return this.data;
@@ -136,12 +301,32 @@ public enum Effect {
@@ -136,12 +306,32 @@ public enum Effect {
static {
for (Effect effect : values()) {