Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 10:57: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:
8fe5611 Fix Player#playerListName nullability annotation (#6089)
8827886 Add back linking to Adventure Javadoc (#6088)
6ea4da4 AbstractSkeleton should extend RangedEntity (#6087)
a831634 add Optimize Light Engine patch (#5863)
56fd1a2 Update to Minecraft 1.17.1 (#6097)
f8d6cbd Deobfuscate stacktraces in sync load info (#6103)

Tuinity Changes:
5065deb Make CollisionContext initialisation lazy
388bdf5 Optimise ActivationRange#activateEntities again
2310a94 Update to 1.17.1
This commit is contained in:
William Blake Galbreath
2021-07-07 04:04:58 -05:00
parent 045bcb4ea9
commit 2040a9ac8a
73 changed files with 19485 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0208-Fix-advancement-triggers-on-entity-death.patch
View File

@@ -47,10 +47,10 @@ index 85d9e1d485699c375e888503b71910b39afc6988..b7ed8f7fec01003a5a006b8c46400e79
CompoundTag nbttagcompound = stack.getTag();
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 9fdc2fb0144db68868e09cf0b1dd19305fc91a50..79956cae6a6fc2a30f52ebadf5f86ee1f13c1e91 100644
index ab55aa6f5717d191d0afb2da357178b294bad40e..ad5197e5f814c02e81c52b2acb2e8554f746a28c 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1015,6 +1015,41 @@ public abstract class Mob extends LivingEntity {
@@ -1020,6 +1020,41 @@ public abstract class Mob extends LivingEntity {
}
@@ -139,10 +139,10 @@ index c9a44a4765f43b9c0247ed1005f4c13469bdee95..6d08c8c31a32ea38f06410fbaddf19b9
public boolean canTakeItem(ItemStack stack) {
net.minecraft.world.entity.EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack);
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 6fa69683727f2111571468261ef16f7c0ff5c238..747f493d6206635787271e8329e56caa89252f35 100644
index 5963b407d936e930a370677113ba947d2c2a198d..b60e38add38ac58d01f419dcb1b07a9b79bf1cb8 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1984,6 +1984,52 @@ public abstract class Player extends LivingEntity {
@@ -1989,6 +1989,52 @@ public abstract class Player extends LivingEntity {
}