Update upstream
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From e2c8fd3966e4d7bbf8825d9b7e22b527d2304811 Mon Sep 17 00:00:00 2001
|
||||
From 97a6a2c62004126fa289c26630892ada77e67845 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
|
||||
@@ -239,7 +239,7 @@ index 00000000..d17061e6
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index c918d67c..01a226d9 100644
|
||||
index 9558645f..86e72f95 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -46,6 +46,9 @@ import org.bukkit.generator.ChunkGenerator;
|
||||
@@ -252,7 +252,7 @@ index c918d67c..01a226d9 100644
|
||||
/**
|
||||
* Represents the Bukkit core, for version and Server singleton handling
|
||||
*/
|
||||
@@ -1289,6 +1292,37 @@ public final class Bukkit {
|
||||
@@ -1315,6 +1318,37 @@ public final class Bukkit {
|
||||
public static boolean suggestPlayerNamesWhenNullTabCompletions() {
|
||||
return server.suggestPlayerNamesWhenNullTabCompletions();
|
||||
}
|
||||
@@ -291,7 +291,7 @@ index c918d67c..01a226d9 100644
|
||||
|
||||
public static Server.Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 96044f4b..6c96fc14 100644
|
||||
index da0d08b3..878255a4 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -47,6 +47,9 @@ import org.bukkit.generator.ChunkGenerator;
|
||||
@@ -304,7 +304,7 @@ index 96044f4b..6c96fc14 100644
|
||||
/**
|
||||
* Represents a server implementation.
|
||||
*/
|
||||
@@ -1107,5 +1110,30 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1133,5 +1136,30 @@ public interface Server extends PluginMessageRecipient {
|
||||
* @return true if player names should be suggested
|
||||
*/
|
||||
boolean suggestPlayerNamesWhenNullTabCompletions();
|
||||
|
||||
Reference in New Issue
Block a user