Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +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@d3c1023 fix player loottables running when mob loot gamerule is false (#7651)
This commit is contained in:
BillyGalbreath
2022-03-30 08:48:14 -05:00
parent 104c214368
commit 47cb2cef8e
13 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0018-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 b2e9d6a2ee654caa6e129d63a6e23f88252ad35d..d86def0cc42af5ccfef69ff43ffac7123753bc00 100644
index 89189f12f467b6b97569553d3af47b14068a6a23..3697b25a60811e4b73d281b49e47d61c41428d81 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -253,6 +253,7 @@ public class ServerPlayer extends Player {
@@ -24,7 +24,7 @@ index b2e9d6a2ee654caa6e129d63a6e23f88252ad35d..d86def0cc42af5ccfef69ff43ffac712
}
// Paper start - Chunk priority
public BlockPos getPointInFront(double inFront) {
@@ -1003,6 +1005,12 @@ public class ServerPlayer extends Player {
@@ -1005,6 +1007,12 @@ public class ServerPlayer extends Player {
}
@@ -37,7 +37,7 @@ index b2e9d6a2ee654caa6e129d63a6e23f88252ad35d..d86def0cc42af5ccfef69ff43ffac712
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -1010,7 +1018,7 @@ public class ServerPlayer extends Player {
@@ -1012,7 +1020,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
@@ -46,7 +46,7 @@ index b2e9d6a2ee654caa6e129d63a6e23f88252ad35d..d86def0cc42af5ccfef69ff43ffac712
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1183,6 +1191,7 @@ public class ServerPlayer extends Player {
@@ -1185,6 +1193,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -54,7 +54,7 @@ index b2e9d6a2ee654caa6e129d63a6e23f88252ad35d..d86def0cc42af5ccfef69ff43ffac712
return this;
}
}
@@ -1957,6 +1966,7 @@ public class ServerPlayer extends Player {
@@ -1959,6 +1968,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index b2e9d6a2ee654caa6e129d63a6e23f88252ad35d..d86def0cc42af5ccfef69ff43ffac712
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2466,9 +2476,17 @@ public class ServerPlayer extends Player {
@@ -2468,9 +2478,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {