9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-28 03:09:11 +00:00

Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@d5c06b4 fix summon_entity effect attempting to add incorrect entity, closes #1545
PurpurMC/Purpur@faa1f93 add PlayerSetTrialSpawnerTypeWithEggEvent, fixes #1546 (#1547)
PurpurMC/Purpur@1ab7990 Updated Upstream (Paper)
PurpurMC/Purpur@8b987b1 fix infinityWorksWithoutArrows not working
PurpurMC/Purpur@de2e7a7 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-07-06 04:09:46 +03:00
parent 18806d3b11
commit 9ccc21d8a9
14 changed files with 94 additions and 92 deletions

View File

@@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under LGPL v3
You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 8c2dd45a146395168e92f2304082a7f6e53edec6..6aaee520213e576f131db430bd4d6df1b34ba197 100644
index b358e5dc570231ae05429c751b4de4a1dcd9e9bf..487083d8dedd422fdb2a80710649932bf7bde9ac 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2641,6 +2641,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2646,6 +2646,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
protected void updateSwingTime() {
@@ -18,7 +18,7 @@ index 8c2dd45a146395168e92f2304082a7f6e53edec6..6aaee520213e576f131db430bd4d6df1
int i = this.getCurrentSwingDuration();
if (this.swinging) {
@@ -3641,6 +3642,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3646,6 +3647,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
private void updateFallFlying() {