mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-10 09:02:09 -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:
@@ -5,7 +5,7 @@ Subject: [PATCH] String based Action Bar API
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
|
||||
index 628b73a12d..2f10dab36c 100644
|
||||
index 628b73a12..2f10dab36 100644
|
||||
--- a/src/main/java/net/minecraft/server/MCUtil.java
|
||||
+++ b/src/main/java/net/minecraft/server/MCUtil.java
|
||||
@@ -0,0 +0,0 @@ package net.minecraft.server;
|
||||
@@ -42,7 +42,7 @@ index 628b73a12d..2f10dab36c 100644
|
||||
public static boolean isMainThread() {
|
||||
return MinecraftServer.getServer().isMainThread();
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 6cf85f0703..1c41f00551 100644
|
||||
index 447ecf636..3a2a88618 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
Reference in New Issue
Block a user