Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-23 16:59:24 +00:00
Code Issues Releases Activity

Updated Upstream (Purpur)

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

Purpur Changes:
PurpurMC/Purpur@ff19bcc Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-07-10 01:19:31 +03:00
parent bfadaa38b1
commit cb01343c94
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
mcVersion = 1.21 mcVersion = 1.21
version = 1.21-R0.1-SNAPSHOT version = 1.21-R0.1-SNAPSHOT
purpurRef = cb0f04bd77350ec0bdf4bc03a68fcca7211c5682 purpurRef = ff19bccd8c59870090ec5de4906844a59d651986
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

0
patches/unapplied/api/0008-Add-Higher-Java-Version-for-Pufferfish.patch → patches/removed/1.21/api/0008-Add-Higher-Java-Version-for-Pufferfish.patch
View File

0
patches/unapplied/server/0052-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch → patches/removed/1.21/server/0052-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch
View File

4
patches/server/0009-Fix-MC-172801.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Fix MC-172801
Original post on Mojira: https://bugs.mojang.com/browse/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 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index cf01a2ef9d72edc7661661c13a85c777bf32b83b..77edee5e7bd9ef9be77dd5f48c57488934fae598 100644 index b06797b805ba52adb3f7619e8768a627911cffa0..00ad560e06d21dcb1415c00976d9957ac00a18c2 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3164,7 +3164,13 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -3163,7 +3163,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
} }
protected float getFlyingSpeed() { protected float getFlyingSpeed() {

6
patches/server/0020-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch
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) 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 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 77edee5e7bd9ef9be77dd5f48c57488934fae598..c07f4de6808d05dc65ac51e17b0c21d94707378a 100644 index 00ad560e06d21dcb1415c00976d9957ac00a18c2..b99866f8d4737ebc5d419d69486ad88a6dcd510f 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2681,6 +2681,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -2680,6 +2680,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
} }
protected void updateSwingTime() { protected void updateSwingTime() {
@@ -18,7 +18,7 @@ index 77edee5e7bd9ef9be77dd5f48c57488934fae598..c07f4de6808d05dc65ac51e17b0c21d9
int i = this.getCurrentSwingDuration(); int i = this.getCurrentSwingDuration();
if (this.swinging) { if (this.swinging) {
@@ -3681,6 +3682,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -3680,6 +3681,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
} }
private void updateFallFlying() { private void updateFallFlying() {