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

Preliminary update to 1.17.1

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0208-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 c4865a08e40205bd17697b039769fd8615b24744..0b8393a3d4202c8c57c5a63142c3ede8a487c595 100644
index 85d9e1d485699c375e888503b71910b39afc6988..b7ed8f7fec01003a5a006b8c46400e79d1aff1ae 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1658,10 +1658,13 @@ public abstract class LivingEntity extends Entity {
@@ -1662,10 +1662,13 @@ public abstract class LivingEntity extends Entity {
}
// Paper start
@@ -33,7 +33,7 @@ index c4865a08e40205bd17697b039769fd8615b24744..0b8393a3d4202c8c57c5a63142c3ede8
}
if (this.isSleeping()) {
@@ -2527,6 +2530,12 @@ public abstract class LivingEntity extends Entity {
@@ -2531,6 +2534,12 @@ public abstract class LivingEntity extends Entity {
@Override
public abstract void setItemSlot(EquipmentSlot slot, ItemStack stack);
@@ -47,10 +47,10 @@ index c4865a08e40205bd17697b039769fd8615b24744..0b8393a3d4202c8c57c5a63142c3ede8
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 dcec19d6323697f8469a7f595e989954c5e3f224..4601df22a3ced8752b6aff9f052e564a24466ce4 100644
index 9fdc2fb0144db68868e09cf0b1dd19305fc91a50..79956cae6a6fc2a30f52ebadf5f86ee1f13c1e91 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1019,6 +1019,41 @@ public abstract class Mob extends LivingEntity {
@@ -1015,6 +1015,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 dfe78217add616c761ba53fb4999cc6593863d2d..b9ce1021f12f14ba45c49890d8d529b733bae532 100644
index 6fa69683727f2111571468261ef16f7c0ff5c238..747f493d6206635787271e8329e56caa89252f35 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1993,6 +1993,52 @@ public abstract class Player extends LivingEntity {
@@ -1984,6 +1984,52 @@ public abstract class Player extends LivingEntity {
}