mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-07 15:42:19 -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: 58d299a5 Clarify that TotalExperience (XpTotal) is not displayed anywhere 3342ab1e #460: Add Player#sendExperienceChange acc05b40 SPIGOT-5525: saveResource saves files from server jars CraftBukkit Changes:5c6b0dc6
SPIGOT-5526: Call EntityChangeBlockEvent for bees triggering crop growthb91ce119
#601: Implement Player#sendExperienceChange661bebc6
Remove outdated build delay.
This commit is contained in:
@@ -258,7 +258,7 @@ index 1eb53f67e..308bc3baf 100644
|
||||
|
||||
this.k = new GameProfileBanList(PlayerList.b);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 77bb68605..cd58906ad 100644
|
||||
index f01d3d382..05efbd67d 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -0,0 +0,0 @@ import java.util.function.Consumer;
|
||||
@@ -284,7 +284,7 @@ index 77bb68605..cd58906ad 100644
|
||||
@Override
|
||||
public PluginCommand getPluginCommand(String name) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index 4a4e56e76..b562e95dc 100644
|
||||
index c9c95752a..4572b302c 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -0,0 +0,0 @@ import java.util.logging.Logger;
|
||||
@@ -323,7 +323,7 @@ index 4a4e56e76..b562e95dc 100644
|
||||
+ System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
|
||||
}
|
||||
|
||||
if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
|
||||
if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
|
||||
@@ -0,0 +0,0 @@ public class Main {
|
||||
System.out.println("Unable to read system info");
|
||||
}
|
||||
|
Reference in New Issue
Block a user