9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2026-01-04 15:31:43 +00:00

Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@ee56117 Updated Upstream (Paper)
PurpurMC/Purpur@847719c one punch!! improvements
PurpurMC/Purpur@1af7456 [ci skip] document mods that patches took inspiration from
This commit is contained in:
NONPLAYT
2024-05-31 12:42:45 +03:00
parent 485032262b
commit a7fe3829b8
3 changed files with 6 additions and 6 deletions

View File

@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
mcVersion = 1.20.6
version = 1.20.6-R0.1-SNAPSHOT
purpurRef = b1464f3bf7c39370cc89268b58a975eaffab0bbe
purpurRef = 1af74564be0136bfc2973e610553e94699331f87
org.gradle.caching = true
org.gradle.parallel = true

View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Fix MC-172801
Original post on Mojira: https://bugs.mojang.com/browse/MC-172801
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 53ff232129443ba3242cfc57fc57026bf76d96e8..66c353e3dcca3704094ec71c38219bf74e7d7fbb 100644
index 74ec7345ef6a55742e05fe6e6a96eed90ab59f81..30348e110ca4df1d331ef509b661231b3af889f7 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3134,7 +3134,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3127,7 +3127,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
protected float getFlyingSpeed() {

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 8b946ed4f252c2ae881e179183559bb9aa98ea79..9a29daf32c31a33babb5526bbf21907aaa0aeca3 100644
index 5d24cbb8a75cf3d3956e165fbe9111b42814b01c..a63a1b6901b03a446402593a8db7381158861e7c 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2653,6 +2653,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 8b946ed4f252c2ae881e179183559bb9aa98ea79..9a29daf32c31a33babb5526bbf21907a
int i = this.getCurrentSwingDuration();
if (this.swinging) {
@@ -3626,6 +3627,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3619,6 +3620,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
private void updateFallFlying() {