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 growth b91ce119 #601: Implement Player#sendExperienceChange 661bebc6 Remove outdated build delay.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From f0e4524e92aa546ee5c57aba4c1940a84faf0ddb Mon Sep 17 00:00:00 2001
|
||||
From 6f4c8c4c2821aefc9c4b9d9559145754d8387185 Mon Sep 17 00:00:00 2001
|
||||
From: Isaac Moore <rmsy@me.com>
|
||||
Date: Tue, 19 Apr 2016 14:09:31 -0500
|
||||
Subject: [PATCH] Implement PlayerLocaleChangeEvent
|
||||
@@ -40,10 +40,10 @@ index 586c9c8ce..de4634486 100644
|
||||
this.ci = packetplayinsettings.e();
|
||||
this.getDataWatcher().set(EntityPlayer.bq, (byte) packetplayinsettings.f());
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 74a0ceba6..fe26ce3af 100644
|
||||
index 5647eb135..447ecf636 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1747,8 +1747,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1768,8 +1768,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
||||
@Override
|
||||
public String getLocale() {
|
||||
@@ -56,7 +56,7 @@ index 74a0ceba6..fe26ce3af 100644
|
||||
}
|
||||
|
||||
// Paper start
|
||||
@@ -1835,7 +1837,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1856,7 +1858,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,5 +65,5 @@ index 74a0ceba6..fe26ce3af 100644
|
||||
{
|
||||
Set<Player> ret = new HashSet<Player>();
|
||||
--
|
||||
2.25.0.windows.1
|
||||
2.25.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user