Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07: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@c029645 Don't allow world unloading while ticking worlds (fixes #8080) (#8081)
PaperMC/Paper@9d0650e Don't print component in resource pack rejection message (#8084)
This commit is contained in:
BillyGalbreath
2022-07-03 04:11:37 -05:00
parent e7d3f0741a
commit 959d211f48
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0020-Player-invulnerabilities.patch
View File

@@ -82,7 +82,7 @@ index faaf63fe5afd825de34a5c4c586d106f859d0d47..9397f5ff682a344282bcea2f6273ecbd
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 c48b44129881d864cca6254b222d0ecbb7d78bcf..474944b20fb81e9e4ed42ec2895673c98bc36420 100644
index 250182281905fd9f02491a5dcd03cd3091a80029..770585c0ba9db619941b2562b34371cc1d167cb8 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2003,12 +2003,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -97,7 +97,7 @@ index c48b44129881d864cca6254b222d0ecbb7d78bcf..474944b20fb81e9e4ed42ec2895673c9
+ }
+ // Purpur end
if (packet.getAction() == ServerboundResourcePackPacket.Action.DECLINED && this.server.isResourcePackRequired()) {
ServerGamePacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack rejection", this.player.getName());
ServerGamePacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack rejection", this.player.getGameProfile().getName()); // Paper - Don't print component in resource pack rejection message
this.disconnect(Component.translatable("multiplayer.requiredTexturePrompt.disconnect"), org.bukkit.event.player.PlayerKickEvent.Cause.RESOURCE_PACK_REJECTION); // Paper - add cause
}
// Paper start