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

Updated Upstream (Paper & Tuinity)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
eaadb4a68f Fix Java toolchain configuration to work on arm macOS
8bebf48495 Mark sensor and behavior timings as verbose
6855505490 Fix some inconsistency issues with empty map items (#6304)
ed1dc272e6 Add System.out.println catcher (#6278)
112b6a508a Add force getter to ParticleBuilder (#6300)
a44f486694 Allow plugins to use Log4J to log (#6288)
8c28a33d4e Don't not shuffle visible chunks (#6283)
0e978ea45e Rewrite LogEvents to contain information about the source jar of stacktrace elements (#6142)
6e7f9aafd6 Prevent AFK kick while watching end credits (#6239). (#6265)

Tuinity Changes:
61c9a54783 Don't use CI build number for implementation version (#356)
dc9d19c984 Update packet limiter config to accept mojang or spigot packet class names (#322)
This commit is contained in:
William Blake Galbreath
2021-08-02 16:05:32 -05:00
parent d4afd4e248
commit 13b1d3715e
21 changed files with 115 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0207-Fix-advancement-triggers-on-entity-death.patch
View File

@@ -16,10 +16,10 @@ restoring it back to the entity just before the criterion triggers run and
then finally clearing the equipment again right after the criterion is done.
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 3df4ca11fc44facd02f358948473d84d1de48e2b..1354cd7e9805f16700d122b281be8038d5dd27ef 100644
index 5bb0a3c4d25c5b06e6547a1789b6b27972fbda59..04e32a71cd97710b8193711fb691cc08e5460daf 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1661,10 +1661,13 @@ public abstract class LivingEntity extends Entity {
@@ -1662,10 +1662,13 @@ public abstract class LivingEntity extends Entity {
}
// Paper start
@@ -33,7 +33,7 @@ index 3df4ca11fc44facd02f358948473d84d1de48e2b..1354cd7e9805f16700d122b281be8038
}
if (this.isSleeping()) {
@@ -2534,6 +2537,12 @@ public abstract class LivingEntity extends Entity {
@@ -2535,6 +2538,12 @@ public abstract class LivingEntity extends Entity {
@Override
public abstract void setItemSlot(EquipmentSlot slot, ItemStack stack);