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:
5059ada Move log message for named entity deaths into correct location (#6105)
b5be382 Add methods to ProtoWorld for working with BlockStates (#5929)
144e5f7 Add option for logging named entity deaths (#6107)
4aef035 [ci skip] Use Java toolchain for run tasks (#6108)
dafc064 Fix MobEffectArgument#getEffect reobf
648f607 Route sign run_command click events through normal chat logic (#6109)
351a2c3 Drop no longer needed patch (#6115)
bb44da8 Fix cancelling EntityPickupItemEvent for villagers (#6091)
This commit is contained in:
William Blake Galbreath
2021-07-07 14:50:53 -05:00
parent afab9a73ef
commit 444413bba6
15 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 3bda2f895612cb5bfd6205a675c03edc6a2270d6..fb031a1da8f1df142155ffb368ccc082da776e97 100644
index 49ecb743320aa3bfba2cd38f25ca5a37b38efe1f..9b6cfd16a15c176b144302b5c38408b88969fa50 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1678,7 +1678,7 @@ public abstract class LivingEntity extends Entity {
@@ -1681,7 +1681,7 @@ public abstract class LivingEntity extends Entity {
boolean flag = false;
if (this.dead && adversary instanceof WitherBoss) { // Paper
@@ -18,7 +18,7 @@ index 3bda2f895612cb5bfd6205a675c03edc6a2270d6..fb031a1da8f1df142155ffb368ccc082
BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 20af97629b614da792bdee2f8e450433570102f2..713b80dde1f6cf3ba516513873c949a57047a566 100644
index 2f061e2825127e4a38e261ccacf56926a2421bb0..ec916af4cace6bdbe5412cbabcbfaed5b1198b39 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -657,7 +657,7 @@ public abstract class Mob extends LivingEntity {
@@ -354,7 +354,7 @@ index 6dda5eeca4e310eceb2598322803bfafc184e9c7..3c51e6d419a244b9270119590aa29952
}
diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
index 9fb0464f74bcbb757171290ae44f4a4c7ea4d499..668724cfaf9f34fe057171b69213782a22f8013b 100644
index 2d4d59eb5a534e4c283933b734c44776b674b2eb..aad204181c4f54ee533bfe3fc04a8705b847e371 100644
--- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
@@ -82,7 +82,7 @@ public class FarmBlock extends Block {