Rebuild patches for upstream changes

Spigot-API-Patches/0001-POM-changes.patch

@@ -1,28 +1,31 @@
-From 2a9e2e37b7b37d4222ce658ad3750e750c4d5649 Mon Sep 17 00:00:00 2001
+From debed199d0ad68d2f21877b6a4f0f9dbe34e8073 Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.com>
-Date: Tue, 9 Dec 2014 20:03:21 -0600
+Date: Tue, 6 Jan 2015 22:12:31 -0600
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 17f976d..3f6a248 100644
+index 44aa858..14c056a 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1,10 +1,10 @@
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-     <modelVersion>4.0.0</modelVersion>
+@@ -9,13 +9,13 @@
+         <version>9</version>
+     </parent>
+ 
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>org.github.paperspigot</groupId>
 +    <artifactId>paperspigot-api</artifactId>
      <version>1.8-R0.1-SNAPSHOT</version>
+     <packaging>jar</packaging>
+ 
 -    <name>Spigot-API</name>
--    <url>http://www.spigotmc.org</url>
+-    <url>http://www.spigotmc.org/</url>
 +    <name>PaperSpigot-API</name>
-+    <url>https://github.com/PaperSpigot/Paper</url>
++    <url>https://hub.spigotmc.org/stash/projects/PAPER/</url>
+     <description>An enhanced plugin API for Minecraft servers.</description>
  
      <properties>
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -- 
 1.9.1
 

Spigot-Server-Patches/0001-POM-changes.patch

@@ -1,11 +1,11 @@
-From 6583416e72c4ceb57406359416451c04aab399d6 Mon Sep 17 00:00:00 2001
+From 88646b8980696cf1d33a10656579ce60d20c617d Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.com>
 Date: Fri, 5 Dec 2014 22:04:50 -0600
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index dc1d420..a5d7d0d 100644
+index 8c4a517..aeceb8b 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -21,11 +21,11 @@ index dc1d420..a5d7d0d 100644
 -  <name>Spigot</name>
 -  <url>http://www.spigotmc.org</url>
 +  <name>PaperSpigot</name>
-+  <url>https://github.com/PaperSpigot/Paper</url>
++  <url>https://hub.spigotmc.org/stash/projects/PAPER/</url>
  
    <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-@@ -19,16 +19,16 @@
+@@ -21,16 +21,16 @@
    </properties>
  
    <parent>
@@ -46,7 +46,7 @@ index dc1d420..a5d7d0d 100644
        <version>${project.version}</version>
        <type>jar</type>
        <scope>compile</scope>
-@@ -103,12 +103,12 @@
+@@ -113,12 +113,12 @@
          </configuration>
          <executions>
            <execution>
@@ -62,7 +62,7 @@ index dc1d420..a5d7d0d 100644
              </configuration>
              <phase>compile</phase>
              <goals>
-@@ -139,7 +139,7 @@
+@@ -149,7 +149,7 @@
              <manifestEntries>
                <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
                <Implementation-Title>CraftBukkit</Implementation-Title>

Spigot-Server-Patches/0003-mc-dev-imports.patch

@@ -1,4 +1,4 @@
-From 341f3417d0859e5ffede7045f1f81dfe43b12d0d Mon Sep 17 00:00:00 2001
+From 246d917ad943f9e6fb6e3c8fa248bddfe37ec50f Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.com>
 Date: Thu, 27 Nov 2014 23:53:56 -0600
 Subject: [PATCH] mc-dev imports
@@ -400,6 +400,6 @@ index 0000000..7b6f8ae
 +
 +    }
 +}
---
+-- 
 1.9.1
 

Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch

@@ -1,11 +1,11 @@
-From 24ce57040df90c39be31435c7fcfd6cd47e48af2 Mon Sep 17 00:00:00 2001
+From c57a1262f399cc774e58f645d037fd31b35ba72b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Nov 2014 00:24:18 -0600
 Subject: [PATCH] Teleport passenger/vehicle with player
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2cca633..dcbc6b5 100644
+index 0a4b7f4..2e6e9c4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -40,6 +40,13 @@ public abstract class Entity implements ICommandListener {
@@ -43,10 +43,10 @@ index 2cca633..dcbc6b5 100644
                  if (j == 1 && i == 1) {
                      BlockPosition blockposition = this.world.r(worldserver1.getSpawn());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9167baf..04a2622 100644
+index c315654..fd00596 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -455,7 +455,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -453,7 +453,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          // If this player is riding another entity, we must dismount before teleporting.
@@ -75,7 +75,7 @@ index 9167baf..04a2622 100644
  
          // Update the From Location
          from = event.getFrom();
-@@ -476,6 +496,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -474,6 +494,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          } else {
              server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true);
          }

Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch

@@ -1,24 +1,11 @@
-From aec3947eeba33c80f737bd1a0beaae15b017b7a9 Mon Sep 17 00:00:00 2001
+From c65b186088762db0436f8b58604355ae8fbfebc5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.com>
 Date: Fri, 28 Nov 2014 00:35:56 -0600
 Subject: [PATCH] Vanished players don't have rights
 
 
-diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index a4b50fe..14ea66d 100644
---- a/src/main/java/net/minecraft/server/ItemBlock.java
-+++ b/src/main/java/net/minecraft/server/ItemBlock.java
-@@ -29,7 +29,7 @@ public class ItemBlock extends Item {
-             return false;
-         } else if (blockposition.getY() == 255 && this.a.getMaterial().isBuildable()) {
-             return false;
--        } else if (world.a(this.a, blockposition, false, enumdirection, (Entity) null, itemstack)) {
-+        } else if (world.a(this.a, blockposition, false, enumdirection, entityhuman, itemstack)) { // PaperSpigot - Pass entityhuman instead of null
-             int i = this.filterData(itemstack.getData());
-             IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
-
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 7d1727d..1d8b138 100644
+index ead7eef..a77ebfe 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -221,6 +221,14 @@ public class EntityArrow extends Entity implements IProjectile {
@@ -55,8 +42,21 @@ index ce3e628..005e995 100644
          if (movingobjectposition != null) {
              if (movingobjectposition.type == EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
                  this.aq();
+diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
+index a4b50fe..14ea66d 100644
+--- a/src/main/java/net/minecraft/server/ItemBlock.java
++++ b/src/main/java/net/minecraft/server/ItemBlock.java
+@@ -29,7 +29,7 @@ public class ItemBlock extends Item {
+             return false;
+         } else if (blockposition.getY() == 255 && this.a.getMaterial().isBuildable()) {
+             return false;
+-        } else if (world.a(this.a, blockposition, false, enumdirection, (Entity) null, itemstack)) {
++        } else if (world.a(this.a, blockposition, false, enumdirection, entityhuman, itemstack)) { // PaperSpigot - Pass entityhuman instead of null
+             int i = this.filterData(itemstack.getData());
+             IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
+ 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9cf1463..7b58d0c 100644
+index ac11b9a..bebf181 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1656,6 +1656,14 @@ public abstract class World implements IBlockAccess {

Spigot-Server-Patches/0012-Fix-redstone-lag-issues.patch

@@ -1,14 +1,14 @@
-From 722f697f6497f7b02193e4236d4fbfe935c04afd Mon Sep 17 00:00:00 2001
+From 3b830fdaadabeb70ff6a2d9ff015308ad51f40e7 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Fri, 28 Nov 2014 01:21:27 -0600
 Subject: [PATCH] Fix redstone lag issues
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ff9ac1b..86044ce 100644
+index a61655f..34fd259 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -591,6 +591,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -590,6 +590,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
              if (i != this.L.size()) {
                  throw new IllegalStateException("TickNextTick list out of synch");
              } else {
@@ -17,7 +17,7 @@ index ff9ac1b..86044ce 100644
                  if (i > 1000) {
                      // CraftBukkit start - If the server has too much to process over time, try to alleviate that
                      if (i > 20 * 1000) {
-@@ -599,7 +601,12 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -598,7 +600,12 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                          i = 1000;
                      }
                      // CraftBukkit end                    

Spigot-Server-Patches/0024-Player-affects-spawning-API.patch

@@ -1,4 +1,4 @@
-From f5c3a5a5da3f65c4ce49e99c9d595075a09041e6 Mon Sep 17 00:00:00 2001
+From ca3686e34247e9ddafb2a06c2cdc68ad0266d1e5 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 28 Nov 2014 03:31:21 -0600
 Subject: [PATCH] Player affects spawning API
@@ -17,7 +17,7 @@ index 2bc2ef6..0199856 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 91c6b71..40abc51 100644
+index 71d4249..438ec3b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -424,7 +424,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -67,7 +67,7 @@ index 43954b3..932a572 100644
                                                          biomemeta = worldserver.a(enumcreaturetype, blockposition2);
                                                          if (biomemeta == null) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3cc9c2e..031a906 100644
+index 186d25d..fa68938 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2,14 +2,13 @@ package net.minecraft.server;
@@ -94,7 +94,7 @@ index 3cc9c2e..031a906 100644
  import org.bukkit.craftbukkit.SpigotTimings; // Spigot
  import org.bukkit.generator.ChunkGenerator;
  import org.bukkit.craftbukkit.CraftServer;
-@@ -2775,6 +2773,50 @@ public abstract class World implements IBlockAccess {
+@@ -2762,6 +2760,50 @@ public abstract class World implements IBlockAccess {
          return false;
      }
  
@@ -146,10 +146,10 @@ index 3cc9c2e..031a906 100644
          for (int i = 0; i < this.players.size(); ++i) {
              EntityHuman entityhuman = (EntityHuman) this.players.get(i);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 04a2622..fca7893 100644
+index fd00596..0b329be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1476,6 +1476,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1474,6 +1474,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }

Spigot-Server-Patches/0027-Remove-invalid-mob-spawner-tile-entities.patch

@@ -1,14 +1,14 @@
-From 9d5edc25a12f2c5f268e5964b396131b066e5b4a Mon Sep 17 00:00:00 2001
+From d2db00a5dafa29088df02116fb313e49838e0d59 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Fri, 28 Nov 2014 03:43:14 -0600
 Subject: [PATCH] Remove invalid mob spawner tile entities
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 858e12c..538ae9c 100644
+index c50ab45..234d2c8 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -768,6 +768,11 @@ public class Chunk {
+@@ -756,6 +756,11 @@ public class Chunk {
                  this.world.triggerHoppersList.add(tileentity);
              }
              // Spigot end

Spigot-Server-Patches/0030-Remove-specific-entities-that-fly-through-an-unloade.patch

@@ -1,11 +1,11 @@
-From be0607cda9319cb9adb809dfd4c7629990682011 Mon Sep 17 00:00:00 2001
+From f3b16fad766f8f47c035ce0d294f3d7626f470e9 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Fri, 28 Nov 2014 12:11:03 -0600
 Subject: [PATCH] Remove specific entities that fly through an unloaded chunk
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7f65a76..4466b47 100644
+index 2e6e9c4..26a1f5d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -119,6 +119,7 @@ public abstract class Entity implements ICommandListener {
@@ -17,10 +17,10 @@ index 7f65a76..4466b47 100644
      // Spigot start
      public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
 diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java
-index 1658cb0..63d88e6 100644
+index 6fd43da..3c103c7 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java
-@@ -19,6 +19,12 @@ public class EntityEnderPearl extends EntityProjectile {
+@@ -26,6 +26,12 @@ public class EntityEnderPearl extends EntityProjectile {
              movingobjectposition.entity.damageEntity(DamageSource.projectile(this, entityliving), 0.0F);
          }
  
@@ -70,7 +70,7 @@ index 4823698..7b856ef 100644
          this.motY *= 0.9800000190734863D;
          this.motZ *= 0.9800000190734863D;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3f84c8f..7f1adda 100644
+index 7507580..72b9a2a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1153,6 +1153,7 @@ public abstract class World implements IBlockAccess {

Spigot-Server-Patches/0034-Only-refresh-abilities-if-needed.patch

@@ -1,14 +1,14 @@
-From 5b4cf49b42198e46038ba4f9a2e1c2ef2448ec76 Mon Sep 17 00:00:00 2001
+From c8203a2b2a6a8e956c40407471543dadbe698393 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Nov 2014 13:20:22 -0600
 Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4559d97..7358519 100644
+index 0b329be..1a41f87 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1176,12 +1176,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1177,12 +1177,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {

Spigot-Server-Patches/0042-Remove-CraftBukkit-Feature-of-ItemStack-s-having-inf.patch

@@ -1,4 +1,4 @@
-From c6d478b50d868bef21254e0d81e0600171510315 Mon Sep 17 00:00:00 2001
+From c9c19a32491103333048f85b01b5ba51292b97b9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Dec 2014 16:28:22 -0600
 Subject: [PATCH] Remove CraftBukkit "Feature" of ItemStack's having infinite
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove CraftBukkit "Feature" of ItemStack's having infinite
 
 
 diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorItem.java b/src/main/java/net/minecraft/server/DispenseBehaviorItem.java
-index 2450265..ea9b20c 100644
+index 63388cf..0195cdc 100644
 --- a/src/main/java/net/minecraft/server/DispenseBehaviorItem.java
 +++ b/src/main/java/net/minecraft/server/DispenseBehaviorItem.java
 @@ -10,6 +10,7 @@ public class DispenseBehaviorItem implements IDispenseBehavior {
@@ -78,7 +78,7 @@ index e5af375..4084dd3 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3b4bb3f..8d97824 100644
+index 69efb4f..b73fa58 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -735,7 +735,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -91,7 +91,7 @@ index 3b4bb3f..8d97824 100644
              itemstack = null;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index a13610e..2012ebd 100644
+index 7b469e1..06cd711 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -342,7 +342,7 @@ public class PlayerInteractManager {
@@ -126,10 +126,10 @@ index 1c27843..ea593e5 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/Slot.java b/src/main/java/net/minecraft/server/Slot.java
-index 375989f..42d6dcf 100644
+index 3e8e7af..6c246a5 100644
 --- a/src/main/java/net/minecraft/server/Slot.java
 +++ b/src/main/java/net/minecraft/server/Slot.java
-@@ -49,6 +49,7 @@ public class Slot {
+@@ -52,6 +52,7 @@ public class Slot {
      }
  
      public void set(ItemStack itemstack) {
@@ -150,5 +150,5 @@ index 040a69f..3269d39 100644
              itemstack.count = this.getMaxStackSize();
          }
 -- 
-1.9.5.msysgit.0
+1.9.1