Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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@a0b59ca [ci skip] Update paperweight to 1.4.1
PaperMC/Paper@035f9d7 Fix items never falling after being on ground (#8768)
PaperMC/Paper@214a8c5 Use single player info update packet on join (#8773)
This commit is contained in:
Encode42
2023-01-08 22:04:14 -05:00
parent 9b9dbeec08
commit 2f8ae1bc6d
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0007-Component-related-conveniences.patch
View File

@@ -36,10 +36,10 @@ index c2ff5d7e4a9f7477b7b207e9d3fb724137a35f11..f3024b03ff7709893d6e39f54504597b
public void displayClientMessage(Component message, boolean overlay) {
this.sendSystemMessage(message, overlay);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index f381bf9064be548a4a603e0042886d8a5e70ba5b..95b1ddc0559f338e99dcacd13ee90587e9e21489 100644
index a01654bb553c00459e64f16e5ccc91b70cc84444..83b080cfd15b03878acca503f0f416166fbc4e5c 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1007,6 +1007,20 @@ public abstract class PlayerList {
@@ -1013,6 +1013,20 @@ public abstract class PlayerList {
}
// CraftBukkit end
@@ -81,7 +81,7 @@ index 2848cb7c76e94d8349f042dc92daf01322a6ce5a..0edf0e24b0b311269b447a34f3aad485
return this.isFireSource;
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6a9c0f0b4b749c5907a274d6a83254284d8763bb..3961f66a23508089df8c4ee7455e170cb870e9d0 100644
index 3073b34a0e0281b6b0330721bb0440147de28511..ebc7034d68a1c732ba5b89c95e79660d5505a74c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3863,6 +3863,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

4
patches/server/0010-Barrels-and-enderchests-6-rows.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Barrels and enderchests 6 rows
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 95b1ddc0559f338e99dcacd13ee90587e9e21489..e3a430827f40c00e60256c21e2fbee1b6c1eab5e 100644
index 83b080cfd15b03878acca503f0f416166fbc4e5c..168abc1f0c795bf840ca87b301dfa85ac0b5dd16 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1132,6 +1132,27 @@ public abstract class PlayerList {
@@ -1138,6 +1138,27 @@ public abstract class PlayerList {
player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
this.server.getCommands().sendCommands(player);
} // Paper

6
patches/server/0018-Player-invulnerabilities.patch
View File

@@ -82,7 +82,7 @@ index e40144aad9182ccb2ed871d74378cf0af783c9f1..8e6c0ab117f7c79e51470a1364995217
public Scoreboard getScoreboard() {
return this.getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 60dd6eb68e500d72e1189322d51d1c1fd71fe881..e6d4bd13bb37329656e2d8931da186d384d3652f 100644
index 668572e6819acdca4b658f693bf9069961dd3366..367a3d1181f29375aed48a861dcf4c2172aa16f9 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2091,12 +2091,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -108,10 +108,10 @@ index 60dd6eb68e500d72e1189322d51d1c1fd71fe881..e6d4bd13bb37329656e2d8931da186d3
this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
// Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index e3a430827f40c00e60256c21e2fbee1b6c1eab5e..95ae7839d7b7596f0692abb6824a172f44710b23 100644
index 168abc1f0c795bf840ca87b301dfa85ac0b5dd16..a9ed0ddc7c5bedb4bca774caa583a6889259e4c0 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -947,6 +947,8 @@ public abstract class PlayerList {
@@ -953,6 +953,8 @@ public abstract class PlayerList {
}
// Paper end

4
patches/server/0048-Add-permission-for-F3-N-debug.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 603d5bfd03d3dec44f627d1260dc40fc3e189f2a..4769512fe2ca9f6704a3bd2e6dfebdecd46f698d 100644
index a9ed0ddc7c5bedb4bca774caa583a6889259e4c0..f2cfcefefaf71ba0f49a1aea34886fd9cb7b69e2 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1126,6 +1126,7 @@ public abstract class PlayerList {
@@ -1132,6 +1132,7 @@ public abstract class PlayerList {
} else {
b0 = (byte) (24 + permissionLevel);
}

6
patches/server/0121-Implement-TPSBar.patch
View File

@@ -85,10 +85,10 @@ index d0a76519d85d4c9e4dc0b98d038a4c447ce5e833..62fa71b3f9fe488c3b7d44d5c2948947
// 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 4769512fe2ca9f6704a3bd2e6dfebdecd46f698d..79578c45c23048de0fbc1d0f09efb7b39629799d 100644
index f2cfcefefaf71ba0f49a1aea34886fd9cb7b69e2..fb06e34821db74a4af4bd56392a5aaae839a8387 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -449,6 +449,7 @@ public abstract class PlayerList {
@@ -455,6 +455,7 @@ public abstract class PlayerList {
scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
}
// Paper end
@@ -96,7 +96,7 @@ index 4769512fe2ca9f6704a3bd2e6dfebdecd46f698d..79578c45c23048de0fbc1d0f09efb7b3
// CraftBukkit - Moved from above, added world
PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
}
@@ -558,6 +559,8 @@ public abstract class PlayerList {
@@ -564,6 +565,8 @@ public abstract class PlayerList {
}
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
// Paper end

4
patches/server/0186-Allow-player-join-full-server-by-permission.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow player join full server by permission
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 6fe21f1464897543a86bffe96e386767a38ff7da..728fcabab244bb1e5731349ad75a4556266b1bc8 100644
index fb06e34821db74a4af4bd56392a5aaae839a8387..47a2c5eb799580501f5b31c85a569fa342646d8b 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -714,7 +714,7 @@ public abstract class PlayerList {
@@ -720,7 +720,7 @@ public abstract class PlayerList {
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, PaperAdventure.asAdventure(ichatmutablecomponent)); // Paper - Adventure
} else {
// return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile) ? IChatBaseComponent.translatable("multiplayer.disconnect.server_full") : null;

10
patches/server/0278-Remove-Timings.patch
View File

@@ -656,7 +656,7 @@ index 077ff3d7620e3c48aca59a92014dbdb7de15e79a..ece55efcd566bcb9b06d305496ab7458
} else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 211a5660547f3fc994d6e74832d47263a93e9e4a..e57ef9c60163d8ee13547d87169ccd0daec4acd4 100644
index 6709f4647cd3f917b9cc6d44a59edcb1a9d6b258..44343b433dc18649e10980c83b155d84adeeee05 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2577,7 +2577,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -687,10 +687,10 @@ index 211a5660547f3fc994d6e74832d47263a93e9e4a..e57ef9c60163d8ee13547d87169ccd0d
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 728fcabab244bb1e5731349ad75a4556266b1bc8..c38acf2f364ed64b8ab1f4a8ef3b270c49e9fbdb 100644
index 47a2c5eb799580501f5b31c85a569fa342646d8b..b0fa557e756d1e30097ad5a72e679d8844b34cd9 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1220,7 +1220,7 @@ public abstract class PlayerList {
@@ -1226,7 +1226,7 @@ public abstract class PlayerList {
public void saveAll(int interval) {
io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -699,7 +699,7 @@ index 728fcabab244bb1e5731349ad75a4556266b1bc8..c38acf2f364ed64b8ab1f4a8ef3b270c
int numSaved = 0;
long now = MinecraftServer.currentTick;
for (int i = 0; i < this.players.size(); ++i) {
@@ -1231,7 +1231,7 @@ public abstract class PlayerList {
@@ -1237,7 +1237,7 @@ public abstract class PlayerList {
}
// Paper end
}
@@ -929,7 +929,7 @@ index 138407c2d4b0bc55ddb9aac5d2aa3edadda090fb..a6e9e503a496c18e2501b03ec84f4600
// Paper end - add timings for scoreboard search
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 383a13a26ee9445fa6201770bb9bef274d72283a..fe830a419c81811f0a72add63a3f09a94392e4a7 100644
index 00744aceb25ddc689b8c5ed90ae27e1ea28057ad..665625c69b93a2568b1f2218a0db39da435d8c99 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -170,7 +170,7 @@ public class ActivationRange