Updated Upstream (Bukkit/CraftBukkit)

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:
3108e64a SPIGOT-4193: API for selecting entities by strings

CraftBukkit Changes:
ad6070df SPIGOT-4193: API for selecting entities by strings
This commit is contained in:
Shane Freeder
2019-01-31 04:49:52 +00:00
parent e87859d8a5
commit 7a73ce03e9
33 changed files with 247 additions and 247 deletions

View File

@@ -1,14 +1,14 @@
From 96b07d31cd5a0d02af4482fc3e8141ec8b360c8e Mon Sep 17 00:00:00 2001
From 06f6137e4b84d9d2a2e29b74cc652e0d66845d3a Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Mon, 29 Feb 2016 19:48:59 -0600
Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 8a6529f3..d4b7c539 100644
index e1ce29328..e4d945830 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1394,6 +1394,17 @@ public final class Bukkit {
@@ -1420,6 +1420,17 @@ public final class Bukkit {
return server.getUnsafe();
}
@@ -27,7 +27,7 @@ index 8a6529f3..d4b7c539 100644
{
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 9651a45c..b9a75b2d 100644
index fea2ad6f4..29e3feb1e 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1065,6 +1065,14 @@ public interface Server extends PluginMessageRecipient {