Update from upstream SpigotMC

a3168ab2ce4
9b45d9fa8d3
b43a31a5c25
a926b96d5d1
d6b5ba7ca03
bb782d07aed
5a74d55c678
47b1dff3e68 [M]

Bukkit-Patches/0006-Add-Particle-API.patch

@@ -1,4 +1,4 @@
-From 793c5a6c9904fdaca5d3454d36cc4e21a95b3737 Mon Sep 17 00:00:00 2001
+From ab23377f32ac7a529cd92da2aa25c28af4f675ca 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
@@ -271,7 +271,7 @@ index 2474a2d..37f29e2 100644
 +    public enum Type {SOUND, VISUAL, PARTICLE}
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index d306201..a909073 100644
+index 828d228..af3d3c4 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1167,6 +1167,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -329,8 +329,8 @@ index d306201..a909073 100644
 +    // Spigot end
 +
      /**
-      * Represents various map environment types that a world may be
-      */
+      * Gets the world border for this world.
+      *
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
 index 31526a3..0810c68 100644
 --- a/src/main/java/org/bukkit/entity/Player.java