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

merge upstream

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 16:49:19 -04:00
parent 9fc89d2e46
commit 102b3130fe
13 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,10 +82,10 @@ index 79c4da6fb1cad621454b08e64f5da79678d21dc5..3a665115eb3da35fa7f5bd1b01b15c55
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 602979d0d85cff155d50780ce2471de0806ae63a..d9005d3bd9f78fca0f5d7b8b64c74c6af0f8fd68 100644
index b67bd2d606e44804f51478847e01da18f0d64349..194c352c1d038ca9726aecfd944b38d572bd2c02 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2001,12 +2001,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -2002,12 +2002,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@Override
public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());