Update from upstream SpigotMC

66af3b310e0
a969bf6c85d
95d56229d8f
87c1d0c8b7c
baf01cc7f84
38b8866783d [M]

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 34268f62473dec95944b065b2d62e82aab2a2464 Mon Sep 17 00:00:00 2001
+From a33af7358dfa85e86fe64c23d34ec21a47f3f5cc Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 13:07:39 +1000
 Subject: [PATCH] POM Changes
@@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
 Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.
 
 diff --git a/pom.xml b/pom.xml
-index e2d4c7d..64600fb 100644
+index e2d4c7d..5fd93be 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -51,7 +51,7 @@ index e2d4c7d..64600fb 100644
        <version>${project.version}</version>
        <type>jar</type>
        <scope>compile</scope>
-@@ -132,15 +139,15 @@
+@@ -132,18 +139,39 @@
  
    <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
    <build>
@@ -61,16 +61,51 @@ index e2d4c7d..64600fb 100644
        <plugin>
          <groupId>com.lukegb.mojo</groupId>
          <artifactId>gitdescribe-maven-plugin</artifactId>
-         <version>1.3</version>
+-        <version>1.3</version>
++        <version>2.0</version>
          <configuration>
 -          <outputPrefix>${buildtag.prefix}</outputPrefix>
 -          <outputPostfix>${buildtag.suffix}</outputPostfix>
-+          <outputPrefix>git-Spigot-</outputPrefix>
+-        </configuration>
-+          <outputPostfix></outputPostfix>
++            <extraArguments>
-         </configuration>
++                <extraArgument>--always</extraArgument>
++            </extraArguments>
++        </configuration>    
          <executions>
            <execution>
-@@ -193,7 +200,7 @@
++            <id>ex-spigot</id>            
++            <configuration>
++              <outputPrefix>git-Spigot-</outputPrefix>
++              <outputPostfix></outputPostfix>
++              <scmDirectory>../</scmDirectory>
++              <descriptionProperty>spigot.desc</descriptionProperty>
++            </configuration>
++            <phase>compile</phase>
++            <goals>
++              <goal>gitdescribe</goal>
++            </goals>
++          </execution>
++          <execution>
++            <id>ex-craftbukkit</id>            
++            <configuration>
++              <outputPrefix>-</outputPrefix>
++              <outputPostfix></outputPostfix>
++              <scmDirectory>../../CraftBukkit</scmDirectory>
++              <descriptionProperty>craftbukkit.desc</descriptionProperty>
++            </configuration>
+             <phase>compile</phase>
+             <goals>
+               <goal>gitdescribe</goal>
+@@ -160,7 +188,7 @@
+             <manifestEntries>
+               <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
+               <Implementation-Title>CraftBukkit</Implementation-Title>
+-              <Implementation-Version>${describe}</Implementation-Version>
++              <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
+               <Implementation-Vendor>Bukkit Team</Implementation-Vendor>
+               <Specification-Title>Bukkit</Specification-Title>
+               <Specification-Version>${api.version}</Specification-Version>
+@@ -193,7 +221,7 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-shade-plugin</artifactId>

CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch

@@ -1,4 +1,4 @@
-From eccaca086e9cc6a04bb6469e0f3ec167f9121fee Mon Sep 17 00:00:00 2001
+From 0acb066ebb5448e7910e2fcb3724d92f71723324 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
@@ -104,10 +104,10 @@ index 64e346d..243e8e5 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0f0e160..acd6a34 100644
+index 3b9bfec..e4d0e41 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1309,4 +1309,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1310,4 +1310,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          collection.add(new AttributeModifiable(getHandle().getAttributeMap(), (new AttributeRanged(null, "generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
      }

CraftBukkit-Patches/0015-Entity-Activation-Range.patch

@@ -1,4 +1,4 @@
-From af62d64b9a60038edfe602295049b4c11baf40a1 Mon Sep 17 00:00:00 2001
+From d0ed5eb0f50dda5d850e23ce84f79817e4f817d8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Feb 2013 05:10:21 -0500
 Subject: [PATCH] Entity Activation Range
@@ -49,7 +49,7 @@ index e2f3456..10e99d1 100644
          this.datawatcher = new DataWatcher(this);
          this.datawatcher.a(0, Byte.valueOf((byte) 0));
 diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
-index 3303d19..8ae38f7 100644
+index 3303d19..035d719 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
 @@ -9,6 +9,31 @@ public abstract class EntityAgeable extends EntityCreature {
@@ -71,11 +71,11 @@ index 3303d19..8ae38f7 100644
 +            if ( i < 0 )
 +            {
 +                ++i;
-+                this.setAge( i );
++                this.setAgeRaw( i );
 +            } else if ( i > 0 )
 +            {
 +                --i;
-+                this.setAge( i );
++                this.setAgeRaw( i );
 +            }
 +        }
 +    }

CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From d6637fb358b0354ead60a507e50010e09cfcb348 Mon Sep 17 00:00:00 2001
+From fd45629acbd8663564bea3f190939d9e7754f033 Mon Sep 17 00:00:00 2001
 From: Andy Shulman <andy.shulman@hotmail.com>
 Date: Mon, 15 Apr 2013 20:06:37 -0500
 Subject: [PATCH] Implement SpawnerSpawnEvent.
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement SpawnerSpawnEvent.
 Adds BUKKIT-267
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 0b177f0..13c7d58 100644
+index fe24b1f..ebcba7b 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -4,7 +4,11 @@ import com.google.common.collect.Lists;
@@ -22,7 +22,7 @@ index 0b177f0..13c7d58 100644
  
  public abstract class MobSpawnerAbstract {
  
-@@ -131,7 +135,12 @@ public abstract class MobSpawnerAbstract {
+@@ -136,7 +140,12 @@ public abstract class MobSpawnerAbstract {
  
              entity.f(nbttagcompound);
              if (entity.world != null && flag) {
@@ -36,7 +36,7 @@ index 0b177f0..13c7d58 100644
              }
  
              NBTTagCompound nbttagcompound1;
-@@ -155,6 +164,11 @@ public abstract class MobSpawnerAbstract {
+@@ -160,6 +169,11 @@ public abstract class MobSpawnerAbstract {
  
                      entity2.f(nbttagcompound2);
                      entity2.setPositionRotation(entity1.locX, entity1.locY, entity1.locZ, entity1.yaw, entity1.pitch);
@@ -48,7 +48,7 @@ index 0b177f0..13c7d58 100644
                      if (entity.world != null && flag) {
                          entity.world.addEntity(entity2, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
                      }
-@@ -166,7 +180,12 @@ public abstract class MobSpawnerAbstract {
+@@ -171,7 +185,12 @@ public abstract class MobSpawnerAbstract {
              }
          } else if (entity instanceof EntityLiving && entity.world != null && flag) {
              ((EntityInsentient) entity).prepare(entity.world.E(new BlockPosition(entity)), (GroupDataEntity) null);

CraftBukkit-Patches/0037-Player-Collision-API.patch

@@ -1,4 +1,4 @@
-From 9c7a158367c21ce04eab04c353170509b4a01534 Mon Sep 17 00:00:00 2001
+From 9ca26db11c543861c8f8faef2e351c353f409284 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API
@@ -64,10 +64,10 @@ index 8d0fc36..d8c8151 100644
      public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
          super(worldserver, gameprofile);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a0df1d2..88c45f1 100644
+index 36469db..d9c0540 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1314,6 +1314,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1315,6 +1315,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Spigot start
      private final Player.Spigot spigot = new Player.Spigot()
      {

CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch

@@ -1,14 +1,14 @@
-From 474b8e425e75d6931365c37f04a04adecc5df970 Mon Sep 17 00:00:00 2001
+From 94d31732d2b54954336f0333af90721d43514e21 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 5 Aug 2013 20:17:20 +1000
 Subject: [PATCH] Cap Minimum Player Speed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 88c45f1..6bdf188 100644
+index d9c0540..b8dcea5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1178,7 +1178,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1179,7 +1179,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setFlySpeed(float value) {
          validateSpeed(value);
          EntityPlayer player = getHandle();
@@ -17,7 +17,7 @@ index 88c45f1..6bdf188 100644
          player.updateAbilities();
  
      }
-@@ -1187,7 +1187,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1188,7 +1188,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setWalkSpeed(float value) {
          validateSpeed(value);
          EntityPlayer player = getHandle();

CraftBukkit-Patches/0046-Implement-respawn-API.patch

@@ -1,14 +1,14 @@
-From e4c6e599c1e8c3d4d22b638596a6b72981bbd29e Mon Sep 17 00:00:00 2001
+From 76c0cd8eadad79d1d0364139c2460c7292cc0dc7 Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:34:49 +0200
 Subject: [PATCH] Implement respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6bdf188..26e77d2 100644
+index b8dcea5..7851f21 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1327,6 +1327,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1328,6 +1328,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              getHandle().collidesWithEntities = collides;
              getHandle().k = collides; // First boolean of Entity
          }

CraftBukkit-Patches/0056-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 78615740f588e09cc50cccc8d735de09200091fb Mon Sep 17 00:00:00 2001
+From 71a96659f5525a395acafe230d584db86629917a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 18:18:41 +1100
 Subject: [PATCH] BungeeCord Support
@@ -151,10 +151,10 @@ index 537932a..dbb3324 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 26e77d2..edac4c7 100644
+index 7851f21..a05f656 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1316,6 +1316,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1317,6 +1317,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      {
  
          @Override

CraftBukkit-Patches/0061-Particle-API.patch

@@ -1,4 +1,4 @@
-From cad4a665ef46edecb4d0f6769c06e8317fb683de Mon Sep 17 00:00:00 2001
+From 454b3b83ea995cce9695a0bad2f36699c941a295 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 20 Dec 2013 21:36:06 +0000
 Subject: [PATCH] Particle API
@@ -132,10 +132,10 @@ index 13f85d5..e395704 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index edac4c7..8cc56d2 100644
+index a05f656..bec510a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1342,6 +1342,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1343,6 +1343,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
              }
          }

CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch

@@ -1,4 +1,4 @@
-From fc6a0de243baacaac6b5a234beaa9a414c24ec69 Mon Sep 17 00:00:00 2001
+From aa38b464f2fb0cb80f3258789626d34f52a5ad98 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 2 Feb 2014 16:55:46 +0000
 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's
@@ -34,10 +34,10 @@ index a8801f1..02eed74 100644
          this.bi.a();
          this.world.methodProfiler.b();
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 13c7d58..4ff4ece 100644
+index ebcba7b..da3f249 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-@@ -139,6 +139,12 @@ public abstract class MobSpawnerAbstract {
+@@ -144,6 +144,12 @@ public abstract class MobSpawnerAbstract {
                  SpawnerSpawnEvent event = CraftEventFactory.callSpawnerSpawnEvent(entity, this.b().getX(), this.b().getY(), this.b().getZ());
                  if (!event.isCancelled()) {
                      entity.world.addEntity(entity, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
@@ -50,7 +50,7 @@ index 13c7d58..4ff4ece 100644
                  }
                  // CraftBukkit end
              }
-@@ -184,6 +190,12 @@ public abstract class MobSpawnerAbstract {
+@@ -189,6 +195,12 @@ public abstract class MobSpawnerAbstract {
              SpawnerSpawnEvent event = CraftEventFactory.callSpawnerSpawnEvent(entity, this.b().getX(), this.b().getY(), this.b().getZ());
              if (!event.isCancelled()) {
                  entity.world.addEntity(entity, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit

CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch

@@ -1,14 +1,14 @@
-From f1bdb825e52f4198145ecba2da30fb0f917a2924 Mon Sep 17 00:00:00 2001
+From e921294b6e5ded9724f3cca90c44193e3d9d6b27 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 23 Dec 2013 15:57:57 +1100
 Subject: [PATCH] Disable Connected Check on setScoreboard
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8cc56d2..5767ab4 100644
+index bec510a..ee4289d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1239,7 +1239,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1240,7 +1240,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              throw new IllegalStateException("Cannot set scoreboard yet");
          }
          if (playerConnection.isDisconnected()) {

CraftBukkit-Patches/0081-Implement-Locale-Getter-for-Players.patch

@@ -1,4 +1,4 @@
-From d78296edfd7ad332f5ee83a2cbe284e3ffaa459a Mon Sep 17 00:00:00 2001
+From 96bd30115104c0b451aa8a27327cca9720d245fe Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:12:16 +1100
 Subject: [PATCH] Implement Locale Getter for Players
@@ -18,10 +18,10 @@ index 5aed971..e8dab78 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5767ab4..7e499cd 100644
+index ee4289d..3c2c3cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1399,6 +1399,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1400,6 +1400,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  getHandle().playerConnection.sendPacket( packet );
              }
          }

CraftBukkit-Patches/0086-Add-support-for-fetching-hidden-players.patch

@@ -1,14 +1,14 @@
-From e80a25bd2cf7de3613071bbd530df3c4f3ce6ade Mon Sep 17 00:00:00 2001
+From 37aa0f5a81539bf9f4f8a3e49c6fa9a2f94d7898 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:03:03 -0500
 Subject: [PATCH] Add support for fetching hidden players
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7e499cd..23c7219 100644
+index 3c2c3cc..b28ec72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1405,6 +1405,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1406,6 +1406,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          {
             return getHandle().locale;
          }

CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch

@@ -1,14 +1,14 @@
-From 99bc7c53a13e3bf05ced99383d6b88ee65050ad7 Mon Sep 17 00:00:00 2001
+From 1a3cc56937c40ebe7fe5e3eb4e5651926df75895 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 20:02:58 +1100
 Subject: [PATCH] Cap Channel Registrations
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 23c7219..573e401 100644
+index b28ec72..5480607 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1059,6 +1059,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1060,6 +1060,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void addChannel(String channel) {

CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch

@@ -1,21 +1,9 @@
-From 703eab9bb4d6cba05271d68b97a3d8ce50205ead Mon Sep 17 00:00:00 2001
+From dc9b26361326393f57a292c0d99070a40f1f790d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 8 Jul 2014 20:27:52 +1000
 Subject: [PATCH] Fix Slow "Loading Libraries"
 
 
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 008e037..46ba3ad 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -171,7 +171,6 @@ public class Main {
-                     System.out.println( "Please see http://www.spigotmc.org/wiki/changing-permgen-size/ for more details and more in-depth instructions." );
-                 }
-                 // Spigot End
--                System.out.println("Loading libraries, please wait...");
-                 MinecraftServer.main(options);
-             } catch (Throwable t) {
-                 t.printStackTrace();
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
 index 36eff85..08d68aa 100644
 --- a/src/main/resources/log4j2.xml
@@ -28,5 +16,5 @@ index 36eff85..08d68aa 100644
          <Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console>
          <Queue name="TerminalConsole">
 -- 
-2.1.0
+1.9.4.msysgit.2
 

CraftBukkit-Patches/0138-Prevent-a-crash-involving-attributes.patch

@@ -1,14 +1,14 @@
-From 9be921dd637edaadca7d6cc409999a087a3cdf7a Mon Sep 17 00:00:00 2001
+From a19334167ae4751278c8d15b3f55027e25b5db46 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 19:54:41 +0100
 Subject: [PATCH] Prevent a crash involving attributes
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 573e401..ae59896 100644
+index 5480607..d1f69dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1309,7 +1309,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1310,7 +1310,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  break;
              }
          }

applyPatches.sh

@@ -7,9 +7,10 @@ echo "Rebuilding Forked projects.... "
 function applyPatch {
     what=$1
     target=$2
+    branch=$3
     cd "$basedir/$what"
     git fetch
-    git reset --hard origin/patched
+    git reset --hard "$branch"
     git branch -f upstream >/dev/null
 
     cd "$basedir"
@@ -39,7 +40,7 @@ function applyPatch {
 echo
 echo "Applying SpigotMC patches to CraftBukkit and Bukkit"
 echo
-applyPatch Bukkit Spigot-API && applyPatch CraftBukkit Spigot-Server
+applyPatch Bukkit Spigot-API origin/master && applyPatch CraftBukkit Spigot-Server origin/patched
 echo
 echo "Applying PaperSpigot patches to Spigot-Server and Spigot-API"
 echo