Paper/patches/server/0379-Optimise-Chunk-getFluid.patch

62 lines
3.0 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
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
2022-03-01 06:43:03 +01:00
index b2050ea7e9c2ad544c45d37b01dd152b28cd3dc9..a909fea6e1cedd1282bf975be200031dde41f99a 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -373,18 +373,20 @@ public class LevelChunk extends ChunkAccess {
2021-06-11 14:02:28 +02:00
}
public FluidState getFluidState(int x, int y, int z) {
- try {
2021-06-14 00:05:18 +02:00
- int l = this.getSectionIndex(y);
-
- if (l >= 0 && l < this.sections.length) {
- LevelChunkSection chunksection = this.sections[l];
+ // try { // Paper - remove try catch
2021-06-11 14:02:28 +02:00
+ // Paper start - reduce the number of ops in this call
2021-06-14 00:05:18 +02:00
+ int index = this.getSectionIndex(y);
2021-06-11 14:02:28 +02:00
+ if (index >= 0 && index < this.sections.length) {
+ LevelChunkSection chunksection = this.sections[index];
if (!chunksection.hasOnlyAir()) {
- return chunksection.getFluidState(x & 15, y & 15, z & 15);
2021-06-11 14:02:28 +02:00
+ return chunksection.states.get((y & 15) << 8 | (z & 15) << 4 | x & 15).getFluidState();
+ // Paper end
2021-06-11 14:02:28 +02:00
}
}
return Fluids.EMPTY.defaultFluidState();
2021-06-14 00:05:18 +02:00
+ /* // Paper - remove try catch
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Getting fluid state");
CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Block being got");
@@ -394,6 +396,7 @@ public class LevelChunk extends ChunkAccess {
2021-06-11 14:02:28 +02:00
});
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
2022-03-01 06:43:03 +01:00
index 67b06640358e04752bf149e9380f5f83d5d1d0f6..cdd17e501c678a4f4bebbaaccdaec1682351e2f2 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
2022-03-01 06:43:03 +01:00
@@ -52,7 +52,7 @@ public class LevelChunkSection {
2021-06-11 14:02:28 +02:00
}
public FluidState getFluidState(int x, int y, int z) {
- return ((BlockState) this.states.get(x, y, z)).getFluidState();
2021-06-14 00:05:18 +02:00
+ 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.
2021-06-11 14:02:28 +02:00
}
public void acquire() {