aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0364-Optimise-Chunk-getFluid.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0364-Optimise-Chunk-getFluid.patch')
-rw-r--r--patches/server/0364-Optimise-Chunk-getFluid.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/patches/server/0364-Optimise-Chunk-getFluid.patch b/patches/server/0364-Optimise-Chunk-getFluid.patch
new file mode 100644
index 0000000000..1d78a740b0
--- /dev/null
+++ b/patches/server/0364-Optimise-Chunk-getFluid.patch
@@ -0,0 +1,61 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <[email protected]>
+Date: Tue, 14 Jan 2020 14:59:08 -0800
+Subject: [PATCH] Optimise Chunk#getFluid
+
+Removing the try catch and generally reducing ops should make it
+faster on its own, however removing the try catch makes it
+easier to inline due to code size
+
+diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+index bc573695ace324c7cd536bc24fbfc66a53ef9fa0..bd1c957a9405ccf18f110c7976cf8e0af922cf78 100644
+--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
++++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+@@ -427,18 +427,20 @@ public class LevelChunk extends ChunkAccess {
+ }
+
+ public FluidState getFluidState(int x, int y, int z) {
+- try {
+- int l = this.getSectionIndex(y);
+-
+- if (l >= 0 && l < this.sections.length) {
+- LevelChunkSection chunksection = this.sections[l];
++ // try { // Paper - remove try catch
++ // Paper start - reduce the number of ops in this call
++ int index = this.getSectionIndex(y);
++ if (index >= 0 && index < this.sections.length) {
++ LevelChunkSection chunksection = this.sections[index];
+
+ if (!chunksection.hasOnlyAir()) {
+- return chunksection.getFluidState(x & 15, y & 15, z & 15);
++ return chunksection.states.get((y & 15) << 8 | (z & 15) << 4 | x & 15).getFluidState();
++ // Paper end
+ }
+ }
+
+ return Fluids.EMPTY.defaultFluidState();
++ /* // Paper - remove try catch
+ } catch (Throwable throwable) {
+ CrashReport crashreport = CrashReport.forThrowable(throwable, "Getting fluid state");
+ CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Block being got");
+@@ -448,6 +450,7 @@ public class LevelChunk extends ChunkAccess {
+ });
+ throw new ReportedException(crashreport);
+ }
++ */ // Paper - remove try catch
+ }
+
+ // CraftBukkit start
+diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
+index 785fbcf9bafcdec1c5be213de3d8512690023415..066874d27495dcaa3dea254b7328257e46920357 100644
+--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
++++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
+@@ -54,7 +54,7 @@ public class LevelChunkSection {
+ }
+
+ public FluidState getFluidState(int x, int y, int z) {
+- return ((BlockState) this.states.get(x, y, z)).getFluidState();
++ return this.states.get(x, y, z).getFluidState(); // Paper - diff on change - we expect this to be effectively just getType(x, y, z).getFluid(). If this changes we need to check other patches that use IBlockData#getFluid.
+ }
+
+ public void acquire() {