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

Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@88aa731 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-05-20 06:10:10 +03:00
parent fa0b20825c
commit ceababc81d
2 changed files with 3 additions and 3 deletions

View File

@@ -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

View File

@@ -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) {