NanaChiyo0721/Shiroha
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix patch conflict

Browse Source
This commit is contained in:
NanaChiyo0721
2026-07-27 20:47:44 +08:00
parent 10cc76bbff
commit 484990074d
20 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shiroha-server/minecraft-patches/features/0013-Fix-riding-statistics-desync.patch
+3 -3
View File
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix riding statistics desync
Referred to: https://github.com/CraftCanvasMC/Canvas/commit/057175b0c10d5a4d1d9059fd9d077750c32633b2
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index e66cfcaa92b90f6b0fd26fd3cec1a5cdbb025117..b08af3a31b80125d02a4f2ff85311d2f9fdcc0ae 100644
index 9168259d0adfd7adb7145f281d0641b0abf111a7..ada7dd26b52cd923bc78e6e6a513a2a1c592793d 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -2537,7 +2537,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -2516,7 +2516,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
}
}
@@ -19,7 +19,7 @@ index e66cfcaa92b90f6b0fd26fd3cec1a5cdbb025117..b08af3a31b80125d02a4f2ff85311d2f
int distance = Math.round((float)Math.sqrt(dx * dx + dy * dy + dz * dz) * 100.0F);
Entity vehicle = this.getVehicle();
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index af3a85087d292d3782acf4c7d15fbfb9f749868d..aa3ed23fbfd85117101e4ef15123b48d9673c5b0 100644
index fe95ab473e8a7b3a9e7a571028d3d8af01000f0b..65aa51503e49c72d3a588c4843eae6ab8992f782 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -4199,7 +4199,13 @@ public abstract class Entity