Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18: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@e5bbb56 Added 1.19 kick event causes (#8204)
This commit is contained in:
BillyGalbreath
2022-07-29 12:59:04 -05:00
parent 13320470dc
commit 723e3703b2
17 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,17 +82,17 @@ index f2e84f02ee8c9c4e4cb2fa5ca27c2df5bf4fcfdb..e7399e71db7ca5671a4570f4e605497b
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 85d18e94ee93f1348871eca697c723eb5482db6b..9bdaaa3f7845e300ad172d5167daa4187aa6fb0c 100644
index eed7394c5736df4a966343cd8c1482dc0dfd0164..43a56a0c06a070e0b01cbb9e11b4ac97623be06b 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2075,12 +2075,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2077,12 +2077,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
+ // Purpur start
+ if (player.level.purpurConfig.playerInvulnerableWhileAcceptingResourcePack && !this.player.acceptingResourcePack) {
+ ServerGamePacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack packet exploitation attempt", this.player.getName());
+ this.disconnect(Component.translatable("multiplayer.texturePrompt.failure.line1")); // "Server resource pack couldn't be applied"
+ this.disconnect(Component.translatable("multiplayer.texturePrompt.failure.line1"), org.bukkit.event.player.PlayerKickEvent.Cause.RESOURCE_PACK_REJECTION); // "Server resource pack couldn't be applied"
+ return;
+ }
+ // Purpur end
@@ -121,7 +121,7 @@ index 3c9d72dd1a1bade79e4c8b5e6c7b136f906ba77d..02707189e0cafcb8db31413566f20784
return entityplayer1;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 69084657049dccad5ba26d22668e8930ff086be8..f01633819138fabe782bb2897ae2488b0d376278 100644
index 1a4da06d45c88219ec0149f94876931f6c699dc9..27e203e45531c053d78149c6e9f782d58e9f5d44 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2907,5 +2907,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {