Update for upstream changes

.gitignore

@@ -47,3 +47,4 @@ Bukkit
 CraftBukkit
 Paperclip
 Paperclip.jar
+paperclip.jar

Paperclip

@@ -1 +1 @@
-Subproject commit 1b58efd4de067e40562ba01fefe70cc22a32ffeb
+Subproject commit 98c39e89d130e39c75cf4ebeea914f7ceb359a84

Spigot-API-Patches/Add-PlayerLocaleChangeEvent.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <1254957+zachbr@users.noreply.github.com>
+From: Isaac Moore <rmsy@me.com>
 Date: Mon, 29 Feb 2016 18:02:25 -0600
 Subject: [PATCH] Add PlayerLocaleChangeEvent
 

Spigot-API-Patches/POM-changes.patch

@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.9-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>

Spigot-Server-Patches/Allow-for-toggling-of-spawn-chunks.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dmck2b <itallhappenedverysuddenly@gmail.com>
+From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Tue, 1 Mar 2016 13:59:50 -0600
+Date: Thu, 3 Mar 2016 03:53:43 -0600
 Subject: [PATCH] Allow for toggling of spawn chunks
 
 
@@ -24,9 +24,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
-         this.isClientSide = flag;
+         this.N.world = (WorldServer) this;
-         this.N = worldprovider.getWorldBorder();
+         this.getServer().addWorld(this.world);
-         this.getServer().addWorld(this.world);  // CraftBukkit
+         // CraftBukkit end
 +        this.keepSpawnInMemory = this.paperConfig.keepSpawnInMemory; // Paper
          timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings
                  this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);

Spigot-Server-Patches/Made-EntityDismountEvent-Cancellable.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Nik Gil <nikmanG@users.noreply.github.com>
-Date: Thu, 3 Mar 2016 01:50:54 -0600
+Date: Thu, 3 Mar 2016 04:04:19 -0600
 Subject: [PATCH] Made EntityDismountEvent Cancellable
 
 
@@ -17,10 +17,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
  public abstract class Entity implements ICommandListener {
 @@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
-                 }
              }
              // CraftBukkit end
--            Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), entity.getBukkitEntity() ) ); // Spigot
+             Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity())); // Spigot
 +            // Paper start - make EntityDismountEvent cancellable
 +            EntityDismountEvent dismountEvent = new EntityDismountEvent(this.getBukkitEntity(), entity.getBukkitEntity()); // Spigot
 +            Bukkit.getPluginManager().callEvent(dismountEvent);

Spigot-Server-Patches/POM-Changes.patch

@@ -17,7 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper</artifactId>
      <packaging>jar</packaging>
-     <version>1.9-SNAPSHOT</version>
+     <version>1.9-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>http://www.spigotmc.org</url>
 +    <name>Paper</name>

Spigot-Server-Patches/Timings-v2.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
-Date: Thu, 3 Mar 2016 01:03:42 -0600
+Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
 
 
@@ -417,9 +417,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          // CraftBukkit end
          MinecraftServer.LOGGER.info("Stopping server");
 +        SpigotTimings.stopServer(); // Paper
-         if (this.am() != null) {
+         // CraftBukkit start
-             this.am().b();
+         if (this.server != null) {
-         }
+             this.server.disablePlugins();
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      protected void B() {}
  
@@ -555,8 +555,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public static boolean haveWeSilencedAPhysicsCrash;
      public static String blockLocation;
 @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
-         this.N = worldprovider.getWorldBorder();
+         this.getServer().addWorld(this.world);
-         this.getServer().addWorld(this.world);  // CraftBukkit
+         // CraftBukkit end
          this.keepSpawnInMemory = this.paperConfig.keepSpawnInMemory; // Paper
 -        timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings
 +        timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings

upstreamMerge.sh

@@ -12,4 +12,5 @@ function update {
 
 update Bukkit
 update CraftBukkit
+update Paperclip