Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27: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:
85ffdc4389 Updated Upstream (CraftBukkit)
f6a1cb21c5 Do not process entity loads in CraftChunk#getEntities (Fixes #6543)
5c7da5536b Prevent an infinite recursion error while rendering translatables (Fixes #6551) (#6555)
cc6fd371b2 Remove "Auto fix bad Y levels on player login" patch
3562558d62 Prevent softlocked end exit portal generation (#6525)
6fa1983e9c Use BlockPost#atY in end portal softlock fix
This commit is contained in:
William Blake Galbreath
2021-09-03 14:52:24 -05:00
parent a36c370c62
commit 8250199f2b
15 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0021-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 19ac7822b4e1c4f1a21600c5e31f971eb87f839f..ac0e43ed7f3385eb89e9b6e80f169b1f31508951 100644
index 04d2e4e641c12fb259ee7758db81b3544193a2df..dafb9dcb3199f217e910a0cd969b863da1df6127 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -259,6 +259,7 @@ public class ServerPlayer extends Player {
@@ -24,7 +24,7 @@ index 19ac7822b4e1c4f1a21600c5e31f971eb87f839f..ac0e43ed7f3385eb89e9b6e80f169b1f
}
// Paper start - Chunk priority
public BlockPos getPointInFront(double inFront) {
@@ -978,6 +980,12 @@ public class ServerPlayer extends Player {
@@ -977,6 +979,12 @@ public class ServerPlayer extends Player {
}
@@ -37,7 +37,7 @@ index 19ac7822b4e1c4f1a21600c5e31f971eb87f839f..ac0e43ed7f3385eb89e9b6e80f169b1f
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -985,7 +993,7 @@ public class ServerPlayer extends Player {
@@ -984,7 +992,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
@@ -46,7 +46,7 @@ index 19ac7822b4e1c4f1a21600c5e31f971eb87f839f..ac0e43ed7f3385eb89e9b6e80f169b1f
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1160,6 +1168,7 @@ public class ServerPlayer extends Player {
@@ -1159,6 +1167,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -54,7 +54,7 @@ index 19ac7822b4e1c4f1a21600c5e31f971eb87f839f..ac0e43ed7f3385eb89e9b6e80f169b1f
return this;
}
}
@@ -1945,6 +1954,7 @@ public class ServerPlayer extends Player {
@@ -1944,6 +1953,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index 19ac7822b4e1c4f1a21600c5e31f971eb87f839f..ac0e43ed7f3385eb89e9b6e80f169b1f
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2451,9 +2461,17 @@ public class ServerPlayer extends Player {
@@ -2450,9 +2460,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {