Updated Upstream (CraftBukkit/Spigot)
Doesn't compile yet. CraftBukkit Changes: 90d6905b Repackage NMS 69cf961d Repackage patches Spigot Changes: 79d53c28 Repackage NMS
This commit is contained in:
@@ -29,10 +29,10 @@ and compute a deterministic result for the MergerList values.
|
||||
Additionally, this lets us avoid even allocating new objects for this too, further
|
||||
reducing memory usage.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/VoxelShapeMergerList.java b/src/main/java/net/minecraft/server/VoxelShapeMergerList.java
|
||||
diff --git a/src/main/java/net/minecraft/world/phys/shapes/VoxelShapeMergerList.java b/src/main/java/net/minecraft/world/phys/shapes/VoxelShapeMergerList.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/VoxelShapeMergerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/VoxelShapeMergerList.java
|
||||
--- a/src/main/java/net/minecraft/world/phys/shapes/VoxelShapeMergerList.java
|
||||
+++ b/src/main/java/net/minecraft/world/phys/shapes/VoxelShapeMergerList.java
|
||||
@@ -0,0 +0,0 @@ import it.unimi.dsi.fastutil.ints.IntArrayList;
|
||||
|
||||
public final class VoxelShapeMergerList implements VoxelShapeMerger {
|
||||
@@ -74,10 +74,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
this.a = new DoubleArrayList(i1);
|
||||
this.b = new IntArrayList(i1);
|
||||
this.c = new IntArrayList(i1);
|
||||
diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java
|
||||
diff --git a/src/main/java/net/minecraft/world/phys/shapes/VoxelShapes.java b/src/main/java/net/minecraft/world/phys/shapes/VoxelShapes.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/VoxelShapes.java
|
||||
+++ b/src/main/java/net/minecraft/server/VoxelShapes.java
|
||||
--- a/src/main/java/net/minecraft/world/phys/shapes/VoxelShapes.java
|
||||
+++ b/src/main/java/net/minecraft/world/phys/shapes/VoxelShapes.java
|
||||
@@ -0,0 +0,0 @@ public final class VoxelShapes {
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user