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

update paper

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-20 16:41:59 -05:00
parent 5455ba8ace
commit 11c5bd4796
11 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 01218ca19f0fd2a6cf8194d4507e40c5bc785b7c..928a931e4543a87c9b3294108843ad686d4ac2ae 100644
index 65e59e3bfc07e1ba6fadd7d83e0f5eb7a58fcf78..609afae1bfdbeb82fb48bdbb0200427a67f1cd2a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -333,6 +333,7 @@ public class ServerPlayer extends Player {
@@ -65,7 +65,7 @@ index 01218ca19f0fd2a6cf8194d4507e40c5bc785b7c..928a931e4543a87c9b3294108843ad68
@Override
public Scoreboard getScoreboard() {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index f29f05ab4bace2a6db23ef6b9d4c9db285a082e0..5f54905841956b691bf83a4d980c24e0969e9456 100644
index a3bea3b4b8094daac108644d97d2e8a1cc027607..3dcaaeab3ba3b4f74fd454c548461263767ce1c4 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1860,6 +1860,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -77,10 +77,10 @@ index f29f05ab4bace2a6db23ef6b9d4c9db285a082e0..5f54905841956b691bf83a4d980c24e0
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 d76d8d8db7921d16f87dd162ccd115e351cde106..fb29b0cb962db93489ff4268c72e7c67cd736867 100644
index a6ecbb7eb1df7923d58366327e0f00512a3a1677..6857abb1b741794d7eda507f738178eb998039f0 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -984,6 +984,8 @@ public abstract class PlayerList {
@@ -990,6 +990,8 @@ public abstract class PlayerList {
}
// Paper end