Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a9f252e Replace third party repos with Paper repo (#7733)
PaperMC/Paper@b8fa41e [ci skip] Remove Mojang repo from test-plugin
PaperMC/Paper@c6e631a Use username instead of display name in PlayerList#getPlayerStats (#7740)
PaperMC/Paper@1cfd363 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
granny
2022-04-16 05:03:34 -07:00
parent daeb232e18
commit d4c11601c7
45 changed files with 186 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0127-Implement-TPSBar.patch
View File

@@ -41,10 +41,10 @@ index 0df8172bc3a5621c2d23b036ce2e5879650757b5..d185dfc8194aad9ed7d1a55817bb4c52
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 4dd87157e667f9d6312713ea254a5f76597dd0b6..80b67eb9c80db9bff4a5b697269fb5f971413f9c 100644
index b5beb009479ad743be64ae48b278d0864e163ed4..152d4f5be6ec00e3a38aeeaf89fbfddfafdc21c3 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -254,6 +254,7 @@ public class ServerPlayer extends Player {
@@ -255,6 +255,7 @@ public class ServerPlayer extends Player {
public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
public boolean purpurClient = false; // Purpur
public boolean acceptingResourcePack = false; // Purpur
@@ -52,7 +52,7 @@ index 4dd87157e667f9d6312713ea254a5f76597dd0b6..80b67eb9c80db9bff4a5b697269fb5f9
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
@@ -475,6 +476,7 @@ public class ServerPlayer extends Player {
@@ -476,6 +477,7 @@ public class ServerPlayer extends Player {
}
}
@@ -60,7 +60,7 @@ index 4dd87157e667f9d6312713ea254a5f76597dd0b6..80b67eb9c80db9bff4a5b697269fb5f9
}
@Override
@@ -535,6 +537,7 @@ public class ServerPlayer extends Player {
@@ -536,6 +538,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -68,7 +68,7 @@ index 4dd87157e667f9d6312713ea254a5f76597dd0b6..80b67eb9c80db9bff4a5b697269fb5f9
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2568,5 +2571,13 @@ public class ServerPlayer extends Player {
@@ -2573,5 +2576,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig.disableTeleportationSuffocationCheck);
}
}
@@ -83,7 +83,7 @@ index 4dd87157e667f9d6312713ea254a5f76597dd0b6..80b67eb9c80db9bff4a5b697269fb5f9
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 4701f86c3ef5ccf0bc5e9a748f80d3aa703ccc3e..19abf99c384f50840a141de1b3f4d823ebd33f74 100644
index 441599f0078f99498aa409d500518366be18bade..631c7d050aad2ffc58ac2066168502d2485c8673 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -493,6 +493,7 @@ public abstract class PlayerList {