Add Spigot's 1.8 protocol patch - Update from upstream

Add support for Minecraft 1.8.x SpigotMC/Spigot@b15ae91145
Skip loading of ProtocolLib SpigotMC/Spigot@508ec8f573
Apply the block fix to block change packets SpigotMC/Spigot@b9349e416d
Blacklist Orebfuscator as well. SpigotMC/Spigot@b2ba105762

Bukkit-Patches/0031-Skip-loading-of-ProtocolLib-and-Orebfuscator.patch

@@ -0,0 +1,33 @@
+From 55d719bb45bb3b91b3b540142c568504b3e7f4c9 Mon Sep 17 00:00:00 2001
+From: md_5 <git@md-5.net>
+Date: Mon, 1 Sep 2014 19:36:20 +1000
+Subject: [PATCH] Skip loading of ProtocolLib and Orebfuscator.
+
+As it does not work with Spigot 1.8 builds!
+
+diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+index 1d51908..c7ad532 100644
+--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
++++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+@@ -132,6 +132,18 @@ public final class SimplePluginManager implements PluginManager {
+             try {
+                 description = loader.getPluginDescription(file);
+                 String name = description.getName();
++                // Spigot Start
++                if ( name.equalsIgnoreCase( "ProtocolLib" ) )
++                {
++                    server.getLogger().log( Level.WARNING, "Skipping loading of ProtocolLib as it does not work with Spigot 1.8 builds!" );
++                    continue;
++                }
++                if ( name.equalsIgnoreCase( "Orebfuscator" ) )
++                {
++                    server.getLogger().log( Level.WARNING, "Skipping loading of Orebfuscator as it does not work with Spigot 1.8 builds!" );
++                    continue;
++                }
++                // Spigot End
+                 if (name.equalsIgnoreCase("bukkit") || name.equalsIgnoreCase("minecraft") || name.equalsIgnoreCase("mojang")) {
+                     server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "': Restricted Name");
+                     continue;
+-- 
+1.9.1
+

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

@@ -1,4 +1,4 @@
-From 18e6a6b6a2d1234d946d8ffaa2e7b00b8d40b551 Mon Sep 17 00:00:00 2001
+From a53609af81b9c93f55ae5cf419f392c92f9f0333 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 May 2014 02:12:39 -0500
 Subject: [PATCH] Teleport passenger/vehicle with player
@@ -43,10 +43,10 @@ index dea5e19..5dc7e95 100644
                  if (j == 1 && i == 1) {
                      ChunkCoordinates chunkcoordinates = 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 e7569c6..770f1d1 100644
+index 35f2bfa..7026f83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -479,6 +479,26 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -491,6 +491,26 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // If this player is riding another entity, we must dismount before teleporting.
          entity.mount(null);
  
@@ -73,7 +73,7 @@ index e7569c6..770f1d1 100644
          // Update the From Location
          from = event.getFrom();
          // Grab the new To Location dependent on whether the event was cancelled.
-@@ -498,6 +518,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -510,6 +530,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          } else {
              server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true);
          }

Spigot-Server-Patches/0008-Configurable-damage-multiplier-for-PvP-blocking.patch

@@ -1,14 +1,14 @@
-From f1e2e7c6fc2053e68ea7903d20fef3e6ab342e68 Mon Sep 17 00:00:00 2001
+From 3e2e1768b7a5673c56438b14adff27392fa82f1c Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.com>
 Date: Tue, 5 Aug 2014 16:21:03 -0500
 Subject: [PATCH] Configurable damage multiplier for PvP blocking
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index f3e4328..c0355bc 100644
+index 5bb7295..a0e4855 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -824,7 +824,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
+@@ -826,7 +826,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
          // CraftBukkit end
          if (!this.isInvulnerable()) {
              if (!damagesource.ignoresArmor() && this.isBlocking() && f > 0.0F) {

Spigot-Server-Patches/0020-Allow-nerfed-mobs-to-jump.patch

@@ -1,14 +1,14 @@
-From 83a26547cdc879226ad2e8c996ce54e21b56b040 Mon Sep 17 00:00:00 2001
+From 0bc7b3848e091aca58db8afe01c02943ca3bd8c0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.com>
 Date: Sun, 29 Jun 2014 13:32:36 -0500
 Subject: [PATCH] Allow nerfed mobs to jump
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index f6c4788..2915f4a 100644
+index 617f7d4..963b6e9 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -403,6 +403,12 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -407,6 +407,12 @@ public abstract class EntityInsentient extends EntityLiving {
          // Spigot Start
          if ( this.fromMobSpawner )
          {

Spigot-Server-Patches/0022-Player-Exhaustion-Multipliers.patch

@@ -1,4 +1,4 @@
-From b602c24185643022a5ccdb755ebd3667b467d1ec Mon Sep 17 00:00:00 2001
+From 413a2db4e6968e7c3f618f7abdc6aa7c6641340b Mon Sep 17 00:00:00 2001
 From: gsand <gsandowns@gmail.com>
 Date: Sun, 17 Aug 2014 16:40:54 -0500
 Subject: [PATCH] Player Exhaustion Multipliers
@@ -18,10 +18,10 @@ index 0893a6f..24e84d6 100644
              ItemStack itemstack = this.j(l);
  
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 0054f18..22776ad 100644
+index a0e4855..35b5cfb 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1304,13 +1304,13 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
+@@ -1314,13 +1314,13 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
                  i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F);
                  if (i > 0) {
                      this.a(StatisticList.m, i);

Spigot-Server-Patches/0023-Add-configurable-despawn-distances-for-living-entiti.patch

@@ -1,14 +1,14 @@
-From f6eb14ae1bb9955b7f74c46cecb138c78b49cd3f Mon Sep 17 00:00:00 2001
+From e9a962e921cbf95753c1e4297a8b40dc53557a6b Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Mon, 7 Jul 2014 04:11:34 +0100
 Subject: [PATCH] Add configurable despawn distances for living entities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 2915f4a..d0f7033 100644
+index 963b6e9..ab2c4c8 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -382,13 +382,13 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -386,13 +386,13 @@ public abstract class EntityInsentient extends EntityLiving {
                  double d2 = entityhuman.locZ - this.locZ;
                  double d3 = d0 * d0 + d1 * d1 + d2 * d2;
  

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

@@ -1,14 +1,14 @@
-From 328d91df5c7c81402790341523d4a4dbe17e46e9 Mon Sep 17 00:00:00 2001
+From 94cf09556e71988186d6621fbc206075452d59b7 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 8 Aug 2014 22:51:26 -0500
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 22776ad..67745b1 100644
+index 35b5cfb..114f406 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -41,6 +41,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
+@@ -42,6 +42,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
      public boolean sleeping; // protected -> public
      public boolean fauxSleeping;
      public String spawnWorld = "";
@@ -17,10 +17,10 @@ index 22776ad..67745b1 100644
      @Override
      public CraftHumanEntity getBukkitEntity() {
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index d0f7033..99664db 100644
+index ab2c4c8..f133a24 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -374,7 +374,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -378,7 +378,7 @@ public abstract class EntityInsentient extends EntityLiving {
          if (this.persistent) {
              this.aU = 0;
          } else {
@@ -106,10 +106,10 @@ index 717be3b..33c228b 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 770f1d1..542508c 100644
+index 7026f83..873f3be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1420,6 +1420,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1432,6 +1432,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
              return java.util.Collections.unmodifiableSet( ret );
          }

Spigot-Server-Patches/0031-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch

@@ -1,4 +1,4 @@
-From 5c5e8954b5e7d29be492b59ddbdc182739df6133 Mon Sep 17 00:00:00 2001
+From f37e6f3216b169882a186764475131f3af1481ab Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.com>
 Date: Tue, 19 Aug 2014 14:21:37 -0500
 Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and
@@ -6,10 +6,10 @@ Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b905c6e..ef695c2 100644
+index 8c3950a..fa10ea1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -987,7 +987,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+@@ -988,7 +988,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
      }
  
      public String getServerModName() {