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

Compile fixes (#2732)

Browse Source
This commit is contained in:
MiniDigger
2019-12-12 19:45:00 +01:00
committed by Shane Freeder
parent 44d032f1e9
commit d8a0622602
28 changed files with 155 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch
View File

@@ -1,4 +1,4 @@
From f17990de6b39edf58fb96266d16b4492b731aa34 Mon Sep 17 00:00:00 2001
From 32e97804d1443bf400e5f0e28293bd5901044fd4 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
@@ -48,7 +48,7 @@ index 0614976b8..a985ae7ba 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 c82de14eb..87b715d69 100644
index 6bdee24f8..e786641cc 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 c82de14eb..87b715d69 100644
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.BaseEncoding;
@@ -1187,8 +1189,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1185,8 +1187,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 c82de14eb..87b715d69 100644
PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId());
if (entry != null) {
entry.clear(getHandle());
@@ -1229,8 +1236,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1227,8 +1234,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
hiddenPlayers.remove(player.getUniqueId());
@@ -90,7 +90,7 @@ index c82de14eb..87b715d69 100644
getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, other));
@@ -1239,6 +1251,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1237,6 +1249,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
entry.updatePlayer(getHandle());
}
}