mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update to 1.12.1

Browse source
This commit is contained in:
BlackHole 2017-08-03 16:36:06 +02:00
parent 2e157dd1b4
commit 6879328bf6
69 changed files with 414 additions and 489 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Spigot-API-Patches/0001-POM-changes.patch
View file

@ -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,7 +99,7 @@ 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>
@ -94,7 +107,7 @@ index 0c3bf997..cce94262 100644
<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

8
Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch
View file

@ -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

8
Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch
View file

@ -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

8
Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
View file

@ -1,4 +1,4 @@
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.
@ -6,10 +6,10 @@ 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

8
Spigot-API-Patches/0058-Profile-Lookup-Events.patch
View file

@ -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