From ceababc81d5f903286e23e375afe46e76acd07a2 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Mon, 20 May 2024 06:10:10 +0300 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@88aa731 Updated Upstream (Paper) --- gradle.properties | 2 +- .../0023-vmp-skip-entity-move-if-movement-is-zero.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index b4955c0..56fcb43 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = space.bxteam.divinemc mcVersion = 1.20.6 version = 1.20.6-R0.1-SNAPSHOT -purpurRef = 9dcfdf13c206866ec56b4044f4a7905886a669ea +purpurRef = 88aa731cf319e853f3db3a73afc5d773b5622170 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0023-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/server/0023-vmp-skip-entity-move-if-movement-is-zero.patch index b26ea2d..06412fd 100644 --- a/patches/server/0023-vmp-skip-entity-move-if-movement-is-zero.patch +++ b/patches/server/0023-vmp-skip-entity-move-if-movement-is-zero.patch @@ -7,7 +7,7 @@ Original code by RelativityMC, licensed under MIT You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 288edb7bcf2159822d6bd14e9a6378a8bad0c689..0acd53f74682b968828c539055c7a7cb6f3dc705 100644 +index 1b8c11fe15f2f672214c75a4f8095ae179b67330..4e762c6ee1c4214b24aabe34a5757785d3e69b12 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -320,6 +320,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -31,7 +31,7 @@ index 288edb7bcf2159822d6bd14e9a6378a8bad0c689..0acd53f74682b968828c539055c7a7cb final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity // Paper start - detailed watchdog information io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main"); -@@ -4217,6 +4224,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4223,6 +4230,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public final void setBoundingBox(AABB boundingBox) {