resolve conflicts

Goldenfield192 · Goldenfield192 · commit 0b274107930f · 2026-02-06T19:42:23.000+08:00
diff --git a/src/main/java/cam72cam/mod/world/ChunkPos.java b/src/main/java/cam72cam/mod/world/ChunkPos.java
@@ -43,7 +43,7 @@ public static long asLong(int x, int y, int z) {
 
     //For 1.16- It turned out processing Y will take much more unnecessary effort...
     public static long asLongExcludeY(AxisAlignedBB aabb) {
-        return asLong(new Vec3d((aabb.maxX + aabb.minX) / 2, 0, (aabb.maxZ + aabb.minZ) / 2)));
+        return asLong(new Vec3d((aabb.maxX + aabb.minX) / 2, 0, (aabb.maxZ + aabb.minZ) / 2));
     }
 
     public static long asLong(AxisAlignedBB aabb) {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static long asLong(int x, int y, int z) {`
`43`	`43`
`44`	`44`	`//For 1.16- It turned out processing Y will take much more unnecessary effort...`
`45`	`45`	`public static long asLongExcludeY(AxisAlignedBB aabb) {`
`46`		`- return asLong(new Vec3d((aabb.maxX + aabb.minX) / 2, 0, (aabb.maxZ + aabb.minZ) / 2)));`
	`46`	`+ return asLong(new Vec3d((aabb.maxX + aabb.minX) / 2, 0, (aabb.maxZ + aabb.minZ) / 2));`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public static long asLong(AxisAlignedBB aabb) {`