Update from upstream SpigotMC

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

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -61,15 +61,50 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
        <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>
-+          <outputPostfix></outputPostfix>
-         </configuration>
+-        </configuration>
++            <extraArguments>
++                <extraArgument>--always</extraArgument>
++            </extraArguments>
++        </configuration>    
          <executions>
            <execution>
++            <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>
+@@ -0,0 +0,0 @@
+             <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>
 @@ -0,0 +0,0 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>

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

@@ -71,11 +71,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            if ( i < 0 )
 +            {
 +                ++i;
-+                this.setAge( i );
++                this.setAgeRaw( i );
 +            } else if ( i > 0 )
 +            {
 +                --i;
-+                this.setAge( i );
++                this.setAgeRaw( i );
 +            }
 +        }
 +    }

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

@@ -4,18 +4,6 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/resources/log4j2.xml
@@ -27,4 +15,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      <Appenders>
          <Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console>
          <Queue name="TerminalConsole">
---
+-- 
+1.9.4.msysgit.2
+

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