Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-06-29 00:04:50 +02:00
Code Issues Projects Releases Wiki Activity

[CI-SKIP] Drop accidental import from last commit

Browse Source
This commit is contained in:
Shane Freeder 2020-06-28 12:24:09 +01:00
parent 4da9f70a50
commit b27469dc9a
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
10 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Spigot-Server-Patches/0202-Player.setPlayerProfile-API.patch
View File

@ -48,7 +48,7 @@ index 80a21dbc05ed3007f2e827f7a320131244c3044b..e0f0a1e91a037f93b239e779aa8fd92b
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 f27fb59e752d25807859396560b213162870998e..9718dd56217dd64f51ea399b4ecf57528eb89e89 100644
index f27fb59e752d25807859396560b213162870998e..66aee62230132d421583ea7c0d99b6f3a462cd7d 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 @@
@ -68,15 +68,7 @@ index f27fb59e752d25807859396560b213162870998e..9718dd56217dd64f51ea399b4ecf5752
import net.minecraft.server.MapIcon;
import net.minecraft.server.MinecraftKey;
import net.minecraft.server.NBTTagCompound;
@@ -54,6 +57,7 @@ import net.minecraft.server.PacketPlayOutMap;
import net.minecraft.server.PacketPlayOutNamedSoundEffect;
import net.minecraft.server.PacketPlayOutPlayerInfo;
import net.minecraft.server.PacketPlayOutPlayerListHeaderFooter;
+import net.minecraft.server.PacketPlayOutRespawn;
import net.minecraft.server.PacketPlayOutSpawnPosition;
import net.minecraft.server.PacketPlayOutStopSound;
import net.minecraft.server.PacketPlayOutTitle;
@@ -1216,8 +1220,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1216,8 +1219,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
hiddenPlayers.put(player.getUniqueId(), hidingPlugins);
// Remove this player from the hidden player's EntityTrackerEntry
@ -91,7 +83,7 @@ index f27fb59e752d25807859396560b213162870998e..9718dd56217dd64f51ea399b4ecf5752
PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId());
if (entry != null) {
entry.clear(getHandle());
@@ -1258,8 +1267,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1258,8 +1266,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
hiddenPlayers.remove(player.getUniqueId());
@ -106,7 +98,7 @@ index f27fb59e752d25807859396560b213162870998e..9718dd56217dd64f51ea399b4ecf5752
getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, other));
@@ -1268,6 +1282,50 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1268,6 +1281,50 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
entry.updatePlayer(getHandle());
}
}

6
Spigot-Server-Patches/0208-Flag-to-disable-the-channel-limit.patch
View File

@ -9,10 +9,10 @@ e.g. servers which allow and support the usage of mod packs.
provide an optional flag to disable this check, at your own risk.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9718dd56217dd64f51ea399b4ecf57528eb89e89..61d4f52f97a9404b1ba10ceaa25c5f79be8b2a9f 100644
index 66aee62230132d421583ea7c0d99b6f3a462cd7d..04d3034148434cd17549018ce337e47c408d1e02 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -143,6 +143,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -142,6 +142,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Paper start
private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
private String resourcePackHash;
@ -20,7 +20,7 @@ index 9718dd56217dd64f51ea399b4ecf57528eb89e89..61d4f52f97a9404b1ba10ceaa25c5f79
// Paper end
public CraftPlayer(CraftServer server, EntityPlayer entity) {
@@ -1488,7 +1489,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1487,7 +1488,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void addChannel(String channel) {

4
Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch
View File

@ -155,10 +155,10 @@ index 27b2ee740a705238995dd3bcea62b4bf74ec82dc..f6209e9c0b9e0ab99693025d23847bc6
@Override
public boolean isBlocking() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 61d4f52f97a9404b1ba10ceaa25c5f79be8b2a9f..2f27b2559977161c5be898a3df928452272b9c3d 100644
index 04d3034148434cd17549018ce337e47c408d1e02..a0fae649733f2cd02ed1df713b43aa1d3a037ef1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -790,7 +790,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -789,7 +789,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Close any foreign inventory
if (getHandle().activeContainer != getHandle().defaultContainer) {

4
Spigot-Server-Patches/0285-Expose-attack-cooldown-methods-for-Player.patch
View File

@ -27,10 +27,10 @@ index d9e5d71a87140c90b79902887bd2f481f02956dc..afc665bfe9d527ca8d19f3ab9df0900d
this.aA = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 2f27b2559977161c5be898a3df928452272b9c3d..417ee5934edc1f17b7186ae920944f9a61b02f34 100644
index a0fae649733f2cd02ed1df713b43aa1d3a037ef1..90acd5e77d5930d589a2f29523b2d2e2850f3f1f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1951,6 +1951,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1950,6 +1950,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getInventory().setItemInMainHand(hand);
}

4
Spigot-Server-Patches/0286-Improve-death-events.patch
View File

@ -357,10 +357,10 @@ index 7b565ddfffd0b9c78392ee115ef9c20ab89a3380..d78b9fd608da691220f1edeff506b36e
this.minecraftKey = minecraftKey;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 417ee5934edc1f17b7186ae920944f9a61b02f34..9e18e3f7819761089f6c908cdb2f4c5afd86d985 100644
index 90acd5e77d5930d589a2f29523b2d2e2850f3f1f..1eff9edb7d6aaf5e6c1094a32d52d38bb41c0ae3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1742,7 +1742,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1741,7 +1741,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void sendHealthUpdate() {

10
Spigot-Server-Patches/0326-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
View File

@ -106,10 +106,10 @@ index 00333548b470435aa89fb0f4b29047eb1461e992..5770d4183c1b9ab6119a25930283c023
public Location getBedSpawnLocation() {
NBTTagCompound data = getData();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9e18e3f7819761089f6c908cdb2f4c5afd86d985..937ac92516b5d27ad080ff0a84b33cc71da4f65d 100644
index 1eff9edb7d6aaf5e6c1094a32d52d38bb41c0ae3..1401eefbe9a2c583d669ad77e63c283e2b2cf433 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -144,6 +144,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -143,6 +143,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
private String resourcePackHash;
private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
@ -117,7 +117,7 @@ index 9e18e3f7819761089f6c908cdb2f4c5afd86d985..937ac92516b5d27ad080ff0a84b33cc7
// Paper end
public CraftPlayer(CraftServer server, EntityPlayer entity) {
@@ -1392,6 +1393,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1391,6 +1392,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.firstPlayed = firstPlayed;
}
@ -136,7 +136,7 @@ index 9e18e3f7819761089f6c908cdb2f4c5afd86d985..937ac92516b5d27ad080ff0a84b33cc7
public void readExtraData(NBTTagCompound nbttagcompound) {
hasPlayedBefore = true;
if (nbttagcompound.hasKey("bukkit")) {
@@ -1414,6 +1427,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1413,6 +1426,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void setExtraData(NBTTagCompound nbttagcompound) {
@ -145,7 +145,7 @@ index 9e18e3f7819761089f6c908cdb2f4c5afd86d985..937ac92516b5d27ad080ff0a84b33cc7
if (!nbttagcompound.hasKey("bukkit")) {
nbttagcompound.set("bukkit", new NBTTagCompound());
}
@@ -1428,6 +1443,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1427,6 +1442,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
data.setLong("firstPlayed", getFirstPlayed());
data.setLong("lastPlayed", System.currentTimeMillis());
data.setString("lastKnownName", handle.getName());

4
Spigot-Server-Patches/0330-Block-Entity-remove-from-being-called-on-Players.patch
View File

@ -12,10 +12,10 @@ Player we will look at limiting the scope of this change. It appears to
be unintentional in the few cases we've seen so far.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 937ac92516b5d27ad080ff0a84b33cc71da4f65d..ed2c4fd43c9bf6ea4e6b647d36e9a5824f9b0b87 100644
index 1401eefbe9a2c583d669ad77e63c283e2b2cf433..915d0da2604de7e2824fc94bafcf7686b22d9e5e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1996,6 +1996,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1995,6 +1995,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetCooldown() {
getHandle().resetCooldown();
}

4
Spigot-Server-Patches/0354-Per-Player-View-Distance-API-placeholders.patch
View File

@ -40,10 +40,10 @@ index 9331f96f68f121b41ce74904d624520291b7c72e..1074995e8c8a83f6cdb94019123fbffa
double deltaZ = this.locZ() - player.locZ();
double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ed2c4fd43c9bf6ea4e6b647d36e9a5824f9b0b87..61ccd4991c14cdcc05352158e26855ef15c82bd0 100644
index 915d0da2604de7e2824fc94bafcf7686b22d9e5e..7ef83fb58e9a86637b7645e0ef6d3d247f88af89 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2005,6 +2005,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2004,6 +2004,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
super.remove();
}
}

4
Spigot-Server-Patches/0458-Implement-Player-Client-Options-API.patch
View File

@ -158,7 +158,7 @@ index dbc3552d50c4129e1844c8a379ab5ba396645f52..be97a0b01b3272e01ece90172f283e3f
return this.e;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 61ccd4991c14cdcc05352158e26855ef15c82bd0..c447e6f9c5ad7a1e58a76884a0c00bbe192671d2 100644
index 7ef83fb58e9a86637b7645e0ef6d3d247f88af89..9dd6f6cac9da8425acb5d59650dbfb0c6be798d9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,5 +1,8 @@
@ -170,7 +170,7 @@ index 61ccd4991c14cdcc05352158e26855ef15c82bd0..c447e6f9c5ad7a1e58a76884a0c00bbe
import com.destroystokyo.paper.Title;
import com.destroystokyo.paper.profile.CraftPlayerProfile;
import com.destroystokyo.paper.profile.PlayerProfile;
@@ -2015,6 +2018,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2014,6 +2017,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setViewDistance(int viewDistance) {
throw new NotImplementedException("Per-Player View Distance APIs need further understanding to properly implement (There are per world view distances though!)"); // TODO
}

4
Spigot-Server-Patches/0497-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
View File

@ -1231,10 +1231,10 @@ index 8a37871bea36bd34b514428acea1acad2ba5897e..b973bd8f60412232df53ac52d97135de
net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) either.left().orElse(null);
return CompletableFuture.completedFuture(chunk == null ? null : chunk.getBukkitChunk());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c447e6f9c5ad7a1e58a76884a0c00bbe192671d2..2faa6dd671df53ac0fa18920773e3ca7425a791e 100644
index 9dd6f6cac9da8425acb5d59650dbfb0c6be798d9..97a24b4dff4a2de06f224458969b9a728041260d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -743,6 +743,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -742,6 +742,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new UnsupportedOperationException("Cannot set rotation of players. Consider teleporting instead.");
}