mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-06 07:02:18 -07:00
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:
451bd74e Use gson for decoding version command
CraftBukkit Changes:
51100db8
SPIGOT-4678: Fix placing signs in certain circumstances
This commit is contained in:
@@ -155,13 +155,13 @@ index 000000000..648b247ef
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
||||
index 8e57aa911..746cedd87 100644
|
||||
index 73d258763..ee07fe5e8 100644
|
||||
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
||||
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
||||
@@ -0,0 +0,0 @@ import org.json.simple.parser.ParseException;
|
||||
// Paper start
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.HttpURLConnection;
|
||||
@@ -0,0 +0,0 @@ import java.net.HttpURLConnection;
|
||||
import org.json.simple.JSONObject;
|
||||
import org.json.simple.parser.JSONParser;
|
||||
import org.json.simple.parser.ParseException;
|
||||
+import com.destroystokyo.paper.VersionHistoryManager;
|
||||
// Paper end
|
||||
|
||||
|
Reference in New Issue
Block a user