mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-21 15:59:23 +00:00
361a0e5785
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@70a76c4 Updated Upstream (Paper) PurpurMC/Purpur@770fbe6 clean up damage type code for stonecutter and scissor patches
42 lines
2.2 KiB
Diff
42 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Fri, 26 Jan 2024 17:42:42 +0300
|
|
Subject: [PATCH] vmp: skip entity move if movement is zero
|
|
|
|
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 b342801c8d336b51edccd84f15e6e1e8c7237e5d..b8f43a8b588d44988ce1fe94aa8550b862093743 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -316,6 +316,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
|
|
public float yRotO;
|
|
public float xRotO;
|
|
private AABB bb;
|
|
+ private boolean boundingBoxChanged = false; // DivineMC - vmp: skip entity move if movement is zero
|
|
public boolean onGround;
|
|
public boolean horizontalCollision;
|
|
public boolean verticalCollision;
|
|
@@ -1106,6 +1107,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
|
|
// Paper end - detailed watchdog information
|
|
|
|
public void move(MoverType movementType, Vec3 movement) {
|
|
+ // DivineMC start - vmp: skip entity move if movement is zero
|
|
+ if (!boundingBoxChanged && movement.equals(Vec3.ZERO)) {
|
|
+ boundingBoxChanged = false;
|
|
+ return;
|
|
+ }
|
|
+ // DivineMC end
|
|
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");
|
|
@@ -4149,6 +4156,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
|
|
}
|
|
|
|
public final void setBoundingBox(AABB boundingBox) {
|
|
+ if (!this.bb.equals(boundingBox)) boundingBoxChanged = true; // DivineMC - vmp: skip entity move if movement is zero
|
|
// CraftBukkit start - block invalid bounding boxes
|
|
double minX = boundingBox.minX,
|
|
minY = boundingBox.minY,
|