Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 6a4242cb #468: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator c6697f90 SPIGOT-5559: Add EntityPotionEffectEvent causes for PATROL_CAPTAIN and WITHER_ROSE 9c1fa040 #467: Add method to remove a recipe by its key 3961d1aa Add nb-configuration.xml to .gitignore CraftBukkit Changes: d70084e5 Remove unused seed in CustomChunkGenerator 8a66d4c7 #619: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator c2dc19d3 Craftbukkit -> CraftBukkit ae45e092 SPIGOT-5559: Add EntityPotionEffectEvent causes for bee, raiders and wither rose 00980376 #618: Add method to remove a recipe by its key Spigot Changes: c574e08b Rebuild patches 13c24cc4 Rebuild patches
This commit is contained in:
parent
55b3a09dde
commit
77b05b9c8e
44 changed files with 268 additions and 265 deletions
|
@ -1,4 +1,4 @@
|
|||
From 9cf9ffe4e56840183e198f65002c4d260a422437 Mon Sep 17 00:00:00 2001
|
||||
From 59ebf71478418359fd0f3967e2394f6148f5a5de 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 00000000..476151d2
|
||||
index 000000000..476151d2a
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
|
||||
@@ -0,0 +1,145 @@
|
||||
|
@ -158,7 +158,7 @@ index 00000000..476151d2
|
|||
+}
|
||||
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 00000000..7b3b6ef5
|
||||
index 000000000..7b3b6ef53
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
|
||||
@@ -0,0 +1,72 @@
|
||||
|
@ -235,10 +235,10 @@ index 00000000..7b3b6ef5
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index b4fef76b..c3bcc653 100644
|
||||
index d0119b3b7..c1f96b46f 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 {
|
||||
@@ -1556,6 +1556,40 @@ public final class Bukkit {
|
||||
public static boolean suggestPlayerNamesWhenNullTabCompletions() {
|
||||
return server.suggestPlayerNamesWhenNullTabCompletions();
|
||||
}
|
||||
|
@ -280,10 +280,10 @@ index b4fef76b..c3bcc653 100644
|
|||
|
||||
@NotNull
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index c108478a..48d8c967 100644
|
||||
index 403a1e17d..a5e87a4ab 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1349,5 +1349,33 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1361,5 +1361,33 @@ public interface Server extends PluginMessageRecipient {
|
||||
* @return true if player names should be suggested
|
||||
*/
|
||||
boolean suggestPlayerNamesWhenNullTabCompletions();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue