mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-10-01 08:38:00 +02:00
a47bfa7ea1
Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: 1421cca \Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.4 ed9e0c4 Fix worldborder checks for getCubes EMC Changes: 110f769f Updated Paper
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: JellySquid <jellysquid+atwork@protonmail.com>
|
|
Date: Mon, 11 May 2020 21:02:57 +0200
|
|
Subject: [PATCH] lithium MixinBox
|
|
|
|
Original code by JellySquid, licensed under GNU Lesser General Public License v3.0
|
|
you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
|
|
index 20e9e06b36cda913809b46e71144d212322619aa..ed5b153f081b8c42b92cb8b195ff54d18e900490 100644
|
|
--- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
|
|
+++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
|
|
@@ -194,12 +194,38 @@ public class AxisAlignedBB {
|
|
return new AxisAlignedBB(vec3d.x, vec3d.y, vec3d.z, vec3d.x + 1.0D, vec3d.y + 1.0D, vec3d.z + 1.0D);
|
|
}
|
|
|
|
+ /**
|
|
+ * @reason Simplify the code to better help the JVM optimize it
|
|
+ * @author JellySquid
|
|
+ */
|
|
public double a(EnumDirection.EnumAxis enumdirection_enumaxis) {
|
|
- return enumdirection_enumaxis.a(this.minX, this.minY, this.minZ);
|
|
+ switch (enumdirection_enumaxis) {
|
|
+ case X:
|
|
+ return this.minX;
|
|
+ case Y:
|
|
+ return this.minY;
|
|
+ case Z:
|
|
+ return this.minZ;
|
|
+ }
|
|
+
|
|
+ throw new IllegalArgumentException();
|
|
}
|
|
|
|
+ /**
|
|
+ * @reason Simplify the code to better help the JVM optimize it
|
|
+ * @author JellySquid
|
|
+ */
|
|
public double b(EnumDirection.EnumAxis enumdirection_enumaxis) {
|
|
- return enumdirection_enumaxis.a(this.maxX, this.maxY, this.maxZ);
|
|
+ switch (enumdirection_enumaxis) {
|
|
+ case X:
|
|
+ return this.maxX;
|
|
+ case Y:
|
|
+ return this.maxY;
|
|
+ case Z:
|
|
+ return this.maxZ;
|
|
+ }
|
|
+
|
|
+ throw new IllegalArgumentException();
|
|
}
|
|
|
|
public boolean equals(Object object) {
|