Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2026-01-04 15:31:43 +00:00
Code Issues Releases Activity

Improve entity merging plugin compatibility

Browse Source
This commit is contained in:
Samsuik
2024-01-28 20:27:11 +00:00
parent 6100146977
commit 5e9b05ed36
6 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0021-Optimise-Fast-Movement.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Optimise Fast Movement
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 8562e2794fc2cc29e55d34186480e820bffe1237..b4dcd8569138dcf4efe3c1e38c409b0977599f86 100644
index 450627cc7eb70be5d926d43026bd62d8b9aa2da7..512f4e76c7f3cb255b2153c3f22ac630e7e6553a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1220,6 +1220,95 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1221,6 +1221,95 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
// Paper end - detailed watchdog information
@@ -104,7 +104,7 @@ index 8562e2794fc2cc29e55d34186480e820bffe1237..b4dcd8569138dcf4efe3c1e38c409b09
public void move(MoverType movementType, Vec3 movement) {
// Paper start - detailed watchdog information
io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
@@ -1597,6 +1686,95 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1598,6 +1687,95 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
return offsetFactor;
}