Repo-Mirror/ParchmentMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update Upstream

Browse Source
This commit is contained in:
lexikiq
2021-06-09 00:30:10 -04:00
parent 91df45a01a
commit 94e5010d31
12 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/api/0001-Parchment-POM-Changes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Parchment POM Changes
diff --git a/pom.xml b/pom.xml
index c2e9ca1cc7f14d3a696385edc3cb341f902fa2fd..e5ed07236c358e9ea544f43b41533c92769192dd 100644
index 73fbd5d5a591871a3a386fb5c455cd96a3992e7a..1e182b441771c7159dd4323c2c72364efb971407 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@

4
patches/api/0002-Create-interfaces-for-getting-UUIDs-and-Players.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Create interfaces for getting UUIDs and Players
Creates new interfaces for getting UUIDs, Human Entities, Offline Players, and Players. Features matching NotNull and Nullable interfaces. Lessens the required overloads for plugin developers when working with varying player objects.
diff --git a/pom.xml b/pom.xml
index e5ed07236c358e9ea544f43b41533c92769192dd..8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165 100644
index 1e182b441771c7159dd4323c2c72364efb971407..6857042b3475925f426cbe9f4858438a02bebd23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,14 @@
@@ -538,7 +538,7 @@ index 2ce774c81a93260a1464183d435b4c418ed61648..aaf08f8e2cce8c7f7f0520fbe3904d26
/**
* Returns the name of this player
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 34b51466ffb281b05f531b3f7deda245ae7fd96a..f37339692b027c0258d2f5bc20ee7db9c6c9b7fb 100644
index a4b236d75e77176a163094edd31f81725bbf4eca..54138dae452714e73549ad1c1512b68267cad443 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -5,6 +5,7 @@ import java.util.Set; // Paper

2
patches/api/0003-Add-Optional-PlayerLike-interfaces.patch
View File

@@ -61,7 +61,7 @@ index e2b4f86fc3825a77a5a0c1c29b428308eee54b16..95220ef8ad0602fae9f88c0231762ff5
@Override
@NotNull default OfflinePlayer getOfflinePlayer() {
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f37339692b027c0258d2f5bc20ee7db9c6c9b7fb..c2866ecabc05edf48712f7fcd3596ae3bf0c46fd 100644
index 54138dae452714e73549ad1c1512b68267cad443..2c9aa0cbce1450695b285a9e654b0e9f10e28c37 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -6,6 +6,7 @@ import java.util.UUID;

8
patches/api/0004-Update-to-Java-15.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Update to Java 15
diff --git a/pom.xml b/pom.xml
index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..ed910c6c7851dc4c4d2c540c0cb6285ae4e4be46 100644
index 6857042b3475925f426cbe9f4858438a02bebd23..a295e88e8c05306c0e5876608797d64df6dc1699 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,10 @@
@@ -21,7 +21,7 @@ index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..ed910c6c7851dc4c4d2c540c0cb6285a
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<adventure.version>4.7.0</adventure.version> <!-- Paper - When updating this make sure to update the linked JavaDocs on the homepage as well! -->
</properties>
@@ -129,7 +131,7 @@
@@ -148,7 +150,7 @@
<!-- annotations -->
<dependency>
<groupId>org.jetbrains</groupId>
@@ -30,7 +30,7 @@ index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..ed910c6c7851dc4c4d2c540c0cb6285a
<version>20.1.0</version>
<scope>provided</scope>
</dependency>
@@ -259,15 +261,38 @@
@@ -278,15 +280,38 @@
</properties>
</configuration>
</plugin>
@@ -70,7 +70,7 @@ index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..ed910c6c7851dc4c4d2c540c0cb6285a
<link>https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/</link>
<!-- Paper start -->
<link>https://jd.adventure.kyori.net/api/${adventure.version}/</link>
@@ -278,6 +303,7 @@
@@ -297,6 +322,7 @@
</links>
</configuration>
</plugin>

2
patches/api/0007-Make-OptionalPlayerLike-extend-Audience.patch
View File

@@ -284,7 +284,7 @@ index 95220ef8ad0602fae9f88c0231762ff50358d98f..27e837a0dbcf37fff9927deb1c34a3ca
@Override
@NotNull default OfflinePlayer getOfflinePlayer() {
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index c2866ecabc05edf48712f7fcd3596ae3bf0c46fd..206f5c00434b35fab27df6bc17c96c789fc8fb2a 100644
index 2c9aa0cbce1450695b285a9e654b0e9f10e28c37..b7ce4b50a7f8f9488cb30a40f0e8acaf2b8d33e7 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -5,8 +5,8 @@ import java.util.Set; // Paper