1.15.2 update (#2887)

Functional GUI fix added by billygalbreath
This commit is contained in:
Spottedleaf 2020-01-21 18:02:07 -08:00 committed by Zach
parent d4ae43fc00
commit 19de9af63c
624 changed files with 2369 additions and 2370 deletions

View file

@ -1,4 +1,4 @@
From 745b108aba89064f140eddb28bf6a793bbb45e75 Mon Sep 17 00:00:00 2001
From 10fb919b099319913ad3b39f2ae5b3533fb0273a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 15 Jan 2018 21:46:46 -0500
Subject: [PATCH] Basic PlayerProfile API
@ -7,7 +7,7 @@ Provides basic elements of a PlayerProfile to be used by future API/events
diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
new file mode 100644
index 000000000..476151d2a
index 00000000..476151d2
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
@@ -0,0 +1,145 @@
@ -158,7 +158,7 @@ index 000000000..476151d2a
+}
diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
new file mode 100644
index 000000000..7b3b6ef53
index 00000000..7b3b6ef5
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
@@ -0,0 +1,72 @@
@ -235,7 +235,7 @@ index 000000000..7b3b6ef53
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index b5b77b2d8..161a714e5 100644
index b5b77b2d..161a714e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1542,6 +1542,40 @@ public final class Bukkit {
@ -280,7 +280,7 @@ index b5b77b2d8..161a714e5 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 103897fbe..463724e40 100644
index 103897fb..463724e4 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1351,5 +1351,33 @@ public interface Server extends PluginMessageRecipient {
@ -318,5 +318,5 @@ index 103897fbe..463724e40 100644
// Paper end
}
--
2.21.0
2.25.0.windows.1