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-01-08 18:33:43 -05:00
parent 993b4ec0ac
commit d4340c647e
38 changed files with 158 additions and 171 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 ab0ef35432c030511df6802bed5f72959932393b..5c62ba693ad9596f55713b77b6f70cd703184719 100644
index 15a03c560dc546eaae54c6ca34fbe298adae77be..b9e736bff38d275ce41d626910791ad38aabe128 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -315,6 +315,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -24,7 +24,7 @@ index ab0ef35432c030511df6802bed5f72959932393b..5c62ba693ad9596f55713b77b6f70cd7
public boolean onGround;
public boolean horizontalCollision;
public boolean verticalCollision;
@@ -1071,6 +1072,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1075,6 +1076,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
// Paper end - detailed watchdog information
public void move(MoverType movementType, Vec3 movement) {
@@ -36,7 +36,7 @@ index ab0ef35432c030511df6802bed5f72959932393b..5c62ba693ad9596f55713b77b6f70cd7
// Paper start - detailed watchdog information
io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
synchronized (this.posLock) {
@@ -4071,6 +4077,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -4075,6 +4081,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
public final void setBoundingBox(AABB boundingBox) {