9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-22 16:29:26 +00:00

Updated Upstream (Paper)

This commit is contained in:
Dreeam
2024-06-16 19:52:06 +08:00
parent f5bb97f315
commit 13572f9d45
13 changed files with 36 additions and 36 deletions

View File

@@ -13,7 +13,7 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index a5e51025e6c2d5fea903b7c1d950ba430966d36d..db0be6ca1ae9c78b8143a7f6a13889d68a0afe38 100644
index ba0e7bc1dd98ea632ab80091acb900b862186dad..329856d3656da0fd01ab1500a423cae554d2544a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -323,6 +323,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -24,7 +24,7 @@ index a5e51025e6c2d5fea903b7c1d950ba430966d36d..db0be6ca1ae9c78b8143a7f6a13889d6
public boolean onGround;
public boolean horizontalCollision;
public boolean verticalCollision;
@@ -1033,6 +1034,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1064,6 +1065,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public void move(MoverType movementType, Vec3 movement) {
@@ -36,7 +36,7 @@ index a5e51025e6c2d5fea903b7c1d950ba430966d36d..db0be6ca1ae9c78b8143a7f6a13889d6
final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
if (this.noPhysics) {
this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
@@ -3954,6 +3960,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3985,6 +3991,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public final void setBoundingBox(AABB boundingBox) {