From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf 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/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java index bb95fe20e8aee58cf20fa764000b9f9123f367d3..33456b0bb421d253aa8366210f41a9da7dcd1699 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -379,17 +379,20 @@ public class Chunk implements IChunkAccess { } public Fluid a(int i, int j, int k) { - try { - if (j >= 0 && j >> 4 < this.sections.length) { - ChunkSection chunksection = this.sections[j >> 4]; - - if (!ChunkSection.a(chunksection)) { - return chunksection.b(i & 15, j & 15, k & 15); + //try { // Paper - remove try catch + // Paper start - reduce the number of ops in this call + int index = j >> 4; + if (index >= 0 && index < this.sections.length) { + ChunkSection chunksection = this.sections[index]; + + if (chunksection != null) { + return chunksection.blockIds.a((j & 15) << 8 | (k & 15) << 4 | i & 15).getFluid(); } + // Paper end } return FluidTypes.EMPTY.h(); - } catch (Throwable throwable) { + /*} catch (Throwable throwable) { // Paper - remove try catch CrashReport crashreport = CrashReport.a(throwable, "Getting fluid state"); CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Block being got"); @@ -398,6 +401,7 @@ public class Chunk implements IChunkAccess { }); throw new ReportedException(crashreport); } + */ // Paper - remove try catch } // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java index 64b625e988f6bb6dc7129b4cb70e266015ab0867..b7b06e082e59f8518be2036637385c7710d524ea 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -37,7 +37,7 @@ public class ChunkSection { } public Fluid b(int i, int j, int k) { - return ((IBlockData) this.blockIds.a(i, j, k)).getFluid(); + return ((IBlockData) this.blockIds.a(i, j, k)).getFluid(); // 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 a() {