mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-02 17:01:38 +01:00
62 lines
3.0 KiB
Diff
62 lines
3.0 KiB
Diff
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
|
|
index becec8ded3f7ed53998b55523793e6e9cd05d492..1c4fc70d3bfd7af90a07894d3244af826596c507 100644
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
|
|
@@ -380,18 +380,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");
|
|
@@ -401,6 +403,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 2c3ea88bac229df67bd742e16d2106d80bcc8889..789664d53584c7d958572c63db22f904fb411a58 100644
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
|
|
@@ -43,7 +43,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() {
|