mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit)

Browse source 
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:
Shane Freeder 2020-01-21 15:12:47 +00:00
commit d4ae43fc00
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
33 changed files with 205 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch
View file

@ -1,4 +1,4 @@
From ac05ce0883009a855bf194cf45f0b00df2136798 Mon Sep 17 00:00:00 2001
From c17321568e2cff1078506c6d8c97f0b3dc277c6f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 18 Mar 2018 12:29:48 -0400
Subject: [PATCH] Player.setPlayerProfile API
@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
This can be useful for changing name or skins after a player has logged in.
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 0d3dceba6e..1aa373ed36 100644
index 0d3dceba6..1aa373ed3 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -66,7 +66,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -19,7 +19,7 @@ index 0d3dceba6e..1aa373ed36 100644
private final ItemCooldown bW;
@Nullable
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index 0614976b86..a985ae7ba0 100644
index 0614976b8..a985ae7ba 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -37,7 +37,7 @@ public class LoginListener implements PacketLoginInListener {
@ -48,7 +48,7 @@ index 0614976b86..a985ae7ba0 100644
uniqueId = i.getId();
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1b6a3570b0..6637ff600f 100644
index 6f47768c9..c3f8f3f4c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,6 +1,8 @@
@ -60,7 +60,7 @@ index 1b6a3570b0..6637ff600f 100644
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.BaseEncoding;
@@ -1190,8 +1192,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1211,8 +1213,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
hiddenPlayers.put(player.getUniqueId(), hidingPlugins);
// Remove this player from the hidden player's EntityTrackerEntry
@ -75,7 +75,7 @@ index 1b6a3570b0..6637ff600f 100644
PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId());
if (entry != null) {
entry.clear(getHandle());
@@ -1232,8 +1239,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1253,8 +1260,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
hiddenPlayers.remove(player.getUniqueId());
@ -90,7 +90,7 @@ index 1b6a3570b0..6637ff600f 100644
getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, other));
@@ -1242,6 +1254,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1263,6 +1275,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
entry.updatePlayer(getHandle());
}
}
@ -138,5 +138,5 @@ index 1b6a3570b0..6637ff600f 100644
public void removeDisconnectingPlayer(Player player) {
hiddenPlayers.remove(player.getUniqueId());
--
2.24.1
2.25.0