Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (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

CraftBukkit Changes:
d208733e SPIGOT-5509: Sleeping player does not eject bed when teleported
This commit is contained in:
Shane Freeder
2020-01-11 13:34:00 +00:00
parent f5569fd3d8
commit c1f57657ee
19 changed files with 125 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch
View File

@@ -1,4 +1,4 @@
From 3536545d96acde2dd82d5b6a3e0c9c5045a0026a Mon Sep 17 00:00:00 2001
From ac05ce0883009a855bf194cf45f0b00df2136798 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 eb8f3833ec..205a842ee6 100644
index 0d3dceba6e..1aa373ed36 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 {
@@ -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 6bdee24f84..96b1eec916 100644
index 1b6a3570b0..6637ff600f 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 6bdee24f84..96b1eec916 100644
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.BaseEncoding;
@@ -1185,8 +1187,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1190,8 +1192,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 6bdee24f84..96b1eec916 100644
PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId());
if (entry != null) {
entry.clear(getHandle());
@@ -1227,8 +1234,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1232,8 +1239,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
hiddenPlayers.remove(player.getUniqueId());
@@ -90,7 +90,7 @@ index 6bdee24f84..96b1eec916 100644
getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, other));
@@ -1237,6 +1249,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1242,6 +1254,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
entry.updatePlayer(getHandle());
}
}