SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Projekte Releases Wiki Aktivität

Fix collision between AABB and a dot (#8733)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Lulu13022002 2023-06-09 04:17:32 +02:00 committet von GitHub
Ursprung 21f2d158c4
Commit 3621d76d8f
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
1 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
patches/server/0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
Datei anzeigen

@ -975,7 +975,7 @@ index 0000000000000000000000000000000000000000..a87f6380b2c387fb0cdd40d5087b5c93
+} +}
diff --git a/src/main/java/io/papermc/paper/voxel/AABBVoxelShape.java b/src/main/java/io/papermc/paper/voxel/AABBVoxelShape.java diff --git a/src/main/java/io/papermc/paper/voxel/AABBVoxelShape.java b/src/main/java/io/papermc/paper/voxel/AABBVoxelShape.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..d67a40e7be030142443680c89e1763fc9ecdfe0a index 0000000000000000000000000000000000000000..3d2fa2466fe40e0b9d7749498684587a11dfa80a
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/voxel/AABBVoxelShape.java +++ b/src/main/java/io/papermc/paper/voxel/AABBVoxelShape.java
@@ -0,0 +1,200 @@ @@ -0,0 +1,200 @@
@ -1159,7 +1159,7 @@ index 0000000000000000000000000000000000000000..d67a40e7be030142443680c89e1763fc
+ +
+ @Override + @Override
+ public double collide(Direction.Axis enumdirection_enumaxis, AABB axisalignedbb, double d0) { + public double collide(Direction.Axis enumdirection_enumaxis, AABB axisalignedbb, double d0) {
+ if (CollisionUtil.isEmpty(this.aabb) || CollisionUtil.isEmpty(axisalignedbb)) { + if (CollisionUtil.isEmpty(this.aabb)) {
+ return d0; + return d0;
+ } + }
+ switch (enumdirection_enumaxis.ordinal()) { + switch (enumdirection_enumaxis.ordinal()) {