Update to 1.12.1

PaperMC · Aug 3, 2017 · 6879328 · 6879328
1 parent 2e157dd
commit 6879328
Show file tree

Hide file tree

Showing 69 changed files with 414 additions and 489 deletions.
diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch
@@ -1,14 +1,14 @@
-From 69671c3d50b5ad75e2c8f11130e76efc5c676fbb Mon Sep 17 00:00:00 2001
+From ed103e824a3c48330567e5b1a0a7bc112e94c4da Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Mon, 29 Feb 2016 17:16:08 -0600
+Date: Tue, 1 Mar 2016 00:16:08 +0100
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 0c3bf997..cce94262 100644
+index 8c6d1aa1..07143b46 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -4,35 +4,36 @@
+@@ -4,44 +4,38 @@
      <modelVersion>4.0.0</modelVersion>
 
      <parent>
@@ -24,7 +24,7 @@ index 0c3bf997..cce94262 100644
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.12-R0.1-SNAPSHOT</version>
+     <version>1.12.1-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
 
 -    <name>Spigot-API</name>
@@ -42,7 +42,6 @@ index 0c3bf997..cce94262 100644
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      </properties>
 
-     <!-- just until we get deployment to central approved -->
      <distributionManagement>
          <repository>
 -            <id>spigotmc-releases</id>
@@ -58,12 +57,26 @@ index 0c3bf997..cce94262 100644
          </snapshotRepository>
      </distributionManagement>
 
-@@ -44,6 +45,13 @@
+-    <repositories>
+-        <repository>
+-            <id>spigotmc-public</id>
+-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+-        </repository>
+-    </repositories>
+-
+     <pluginRepositories>
+         <pluginRepository>
+             <id>spigotmc-public</id>
+@@ -49,6 +43,17 @@
          </pluginRepository>
      </pluginRepositories>
 
 +    <repositories>
 +        <repository>
++            <id>spigotmc-public</id>
++            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
++        </repository>
++        <repository>
 +            <id>sonatype</id>
 +            <url>https://oss.sonatype.org/content/groups/public/</url>
 +        </repository>
@@ -72,7 +85,7 @@ index 0c3bf997..cce94262 100644
      <dependencies>
          <dependency>
              <groupId>commons-lang</groupId>
-@@ -58,6 +66,13 @@
+@@ -63,6 +68,13 @@
              <type>jar</type>
              <scope>compile</scope>
          </dependency>
@@ -86,15 +99,15 @@ index 0c3bf997..cce94262 100644
          <!-- bundled with Minecraft, should be kept in sync -->
          <dependency>
              <groupId>com.google.guava</groupId>
-@@ -102,6 +117,7 @@
+@@ -107,6 +119,7 @@
      </dependencies>
 
      <build>
 +        <defaultGoal>clean install</defaultGoal>
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-@@ -121,26 +137,6 @@
+@@ -126,26 +139,6 @@
                  </dependencies>
              </plugin>
              <plugin>
@@ -121,7 +134,7 @@ index 0c3bf997..cce94262 100644
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-shade-plugin</artifactId>
                  <version>3.0.0</version>
-@@ -153,8 +149,7 @@
+@@ -158,8 +151,7 @@
                      </execution>
                  </executions>
                  <configuration>
@@ -132,5 +145,5 @@ index 0c3bf997..cce94262 100644
                      <shadedArtifactAttached>true</shadedArtifactAttached>
                  </configuration>
 -- 
-2.13.0
+2.13.3.windows.1
 
diff --git a/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch
@@ -1,14 +1,14 @@
-From 1ea2f5f4ceef51d35a4266ed0b3eb471fde1bff8 Mon Sep 17 00:00:00 2001
+From 5043bec2a991e4d8c55b934538518a5c112772f1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 1 Apr 2016 00:02:47 -0400
 Subject: [PATCH] add Trove and FastUtil to Bukkit
 
 
 diff --git a/pom.xml b/pom.xml
-index 968f9091..04168f66 100644
+index 07143b46..1e57d386 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -54,6 +54,19 @@
+@@ -56,6 +56,19 @@
 
      <dependencies>
          <dependency>
@@ -29,5 +29,5 @@ index 968f9091..04168f66 100644
              <artifactId>commons-lang</artifactId>
              <version>2.6</version>
 -- 
-2.13.0.windows.1
+2.13.3.windows.1
 
diff --git a/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,14 +1,14 @@
-From 5ef20af4d2a072437de748eaa6e247164cc4254e Mon Sep 17 00:00:00 2001
+From 983f39e99a72d696cce6d90cd3688cbffbf5bf22 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index fc41a43d..d6597ca7 100644
+index 5a30fa93..be51e389 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -389,4 +389,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -360,4 +360,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
       * @return collision status
       */
      boolean isCollidable();
@@ -29,5 +29,5 @@ index fc41a43d..d6597ca7 100644
 +    // Paper end
  }
 -- 
-2.13.0
+2.13.3.windows.1
 
diff --git a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
@@ -1,15 +1,15 @@
-From 2ba17bea4632f1947234d462d0e7bc597450f0fe Mon Sep 17 00:00:00 2001
+From 10a16475692e849a7707ad9d542df68bd9ace602 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 13:20:33 -0700
 Subject: [PATCH] Use ASM for event executors.
 
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index 04168f66..862910e0 100644
+index 1e57d386..de5bc3f3 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -127,6 +127,12 @@
+@@ -129,6 +129,12 @@
              <version>1.3</version>
              <scope>test</scope>
          </dependency>
@@ -395,5 +395,5 @@ index d8b9c244..40fd71dc 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 -- 
-2.13.0.windows.1
+2.13.3.windows.1
 
diff --git a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From 5385d2681d3cad437db365cbfa18673430f323e2 Mon Sep 17 00:00:00 2001
+From cb77703817c58fc10b14faf4fbfaeee5a9f98e7b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 16:30:44 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -7,10 +7,10 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
 profiles that had to be looked up.
 
 diff --git a/pom.xml b/pom.xml
-index 09fb3408..4ff0c6f2 100644
+index de5bc3f3..293442c3 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -60,6 +60,13 @@
+@@ -62,6 +62,13 @@
              <!-- Trove Provided by CraftBukkit -->
              <scope>provided</scope>
          </dependency>
@@ -235,5 +235,5 @@ index 00000000..750b9334
 +    }
 +}
 -- 
-2.13.3
+2.13.3.windows.1
 
diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -1,11 +1,11 @@
-From b14b02e17ed398f786427ff1c794ea9a24611d5a Mon Sep 17 00:00:00 2001
+From 44f2671b31ac71bd6408dcc230cafa239470f434 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:40:33 -0600
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index dafedf609..4cac7e38e 100644
+index 9072ab9f4..bb305c7c2 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -17,7 +17,7 @@ index dafedf609..4cac7e38e 100644
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper</artifactId>
      <packaging>jar</packaging>
-     <version>1.12-R0.1-SNAPSHOT</version>
+     <version>1.12.1-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>http://www.spigotmc.org</url>
 +    <name>Paper</name>
@@ -47,7 +47,7 @@ index dafedf609..4cac7e38e 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
-@@ -102,34 +102,22 @@
+@@ -108,34 +108,22 @@
 
      <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
      <build>
@@ -93,7 +93,7 @@ index dafedf609..4cac7e38e 100644
                          </goals>
                      </execution>
                  </executions>
-@@ -139,11 +127,12 @@
+@@ -145,11 +133,12 @@
                  <artifactId>maven-jar-plugin</artifactId>
                  <version>3.0.2</version>
                  <configuration>
@@ -107,7 +107,7 @@ index dafedf609..4cac7e38e 100644
                              <Implementation-Vendor>${maven.build.timestamp}</Implementation-Vendor>
                              <Specification-Title>Bukkit</Specification-Title>
                              <Specification-Version>${api.version}</Specification-Version>
-@@ -203,19 +192,22 @@
+@@ -209,19 +198,22 @@
                              <goal>shade</goal>
                          </goals>
                          <configuration>
@@ -138,7 +138,7 @@ index dafedf609..4cac7e38e 100644
                                  <relocation>
                                      <pattern>org.bukkit.craftbukkit</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
-@@ -241,18 +233,6 @@
+@@ -247,18 +239,6 @@
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
                  <version>3.6.1</version>
@@ -171,5 +171,5 @@ index 93046379d..674096cab 100644
 
          if (stream != null) {
 -- 
-2.13.0
+2.13.3.windows.1
 
diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch
@@ -1,4 +1,4 @@
-From 23030933bd7a18768c7dca7736c225ac268c5e49 Mon Sep 17 00:00:00 2001
+From 74540d1d2671859627d8738cc1b28247a90c08cd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 21:02:09 -0600
 Subject: [PATCH] Paper config files
@@ -337,7 +337,7 @@ index 000000000..621bf7051
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 2e72afae2..5e6a7b9e4 100644
+index 46b264227..6f63a5a1d 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -184,6 +184,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -352,10 +352,10 @@ index 2e72afae2..5e6a7b9e4 100644
              DedicatedServer.LOGGER.info("Generating keypair");
              this.a(MinecraftEncryption.b());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ecd67652d..5fe013e6b 100644
+index e1833f376..1096c6c66 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -128,6 +128,8 @@ public abstract class World implements IBlockAccess {
+@@ -129,6 +129,8 @@ public abstract class World implements IBlockAccess {
      private int tickPosition;
      public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
 
@@ -364,7 +364,7 @@ index ecd67652d..5fe013e6b 100644
      public final SpigotTimings.WorldTimingsHandler timings; // Spigot
      private boolean guardEntityList; // Spigot
      public static boolean haveWeSilencedAPhysicsCrash;
-@@ -150,6 +152,7 @@ public abstract class World implements IBlockAccess {
+@@ -151,6 +153,7 @@ public abstract class World implements IBlockAccess {
 
      protected World(IDataManager idatamanager, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
@@ -428,7 +428,7 @@ index e0fa25bb2..3354bf65f 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index a151451d5..0c5862a3f 100644
+index a1b240daf..96585fb24 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -126,6 +126,14 @@ public class Main {
@@ -488,5 +488,5 @@ index 01e73eb89..0b66f5e35 100644
          config.addDefault( "world-settings.default." + path, def );
          return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
 -- 
-2.13.3
+2.13.3.windows.1