From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Mon, 7 Jul 2025 04:21:38 +0300 Subject: [PATCH] Small optimization to LinearPalette diff --git a/net/minecraft/world/level/chunk/LinearPalette.java b/net/minecraft/world/level/chunk/LinearPalette.java index 9aa55456d18ffa3ad5cc300ed321582b2a7af1d1..af687853650d9fc58b23d88a7c6e19f36615e8b7 100644 --- a/net/minecraft/world/level/chunk/LinearPalette.java +++ b/net/minecraft/world/level/chunk/LinearPalette.java @@ -10,7 +10,7 @@ import org.apache.commons.lang3.Validate; public class LinearPalette implements Palette, ca.spottedleaf.moonrise.patches.fast_palette.FastPalette { // Paper - optimise palette reads private final T[] values; private final int bits; - private int size; + private volatile int size; // DivineMC - Small optimization to LinearPalette // Paper start - optimise palette reads @Override @@ -43,11 +43,16 @@ public class LinearPalette implements Palette, ca.spottedleaf.moonrise.pat @Override public int idFor(T state, PaletteResize resizeHandler) { - for (int i = 0; i < this.size; i++) { - if (this.values[i] == state) { + // DivineMC start - Small optimization to LinearPalette + final T[] values = this.values; + final int currentSize = this.size; + + for (int i = 0; i < currentSize; i++) { + if (values[i] == state) { return i; } } + // DivineMC end - Small optimization to LinearPalette int ix = this.size; if (ix < this.values.length) { @@ -61,17 +66,23 @@ public class LinearPalette implements Palette, ca.spottedleaf.moonrise.pat @Override public boolean maybeHas(Predicate filter) { - for (int i = 0; i < this.size; i++) { - if (filter.test(this.values[i])) { + // DivineMC start - Small optimization to LinearPalette + final T[] values = this.values; + final int currentSize = this.size; + + for (int i = 0; i < currentSize; i++) { + T value = values[i]; + if (value != null && filter.test(value)) { return true; } } + // DivineMC end - Small optimization to LinearPalette return false; } @Override - public T valueFor(int id) { + public synchronized T valueFor(int id) { // DivineMC - Small optimization to LinearPalette if (id >= 0 && id < this.size) { return this.values[id]; } else {