Merge pull request #3423

MattBDev · web-flow · commit 7f7bc1c2a1d9 · 2026-01-06T22:55:42.000-05:00
Improve palette mapping performance by avoiding max
diff --git a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/NMSAdapter.java b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/NMSAdapter.java
@@ -86,12 +86,14 @@ private static void mapPalette(
             System.arraycopy(adapter.getIbdToOrdinal(), 0, paletteToBlock, 0, adapter.getIbdToOrdinal().length);
             System.arraycopy(adapter.getOrdinalToIbdID(), 0, blockToPalette, 0, adapter.getOrdinalToIbdID().length);
         }
+        int oldVal = blockToPalette[BlockTypesCache.ReservedIDs.__RESERVED__];
+        blockToPalette[BlockTypesCache.ReservedIDs.__RESERVED__] = blockToPalette[BlockTypesCache.ReservedIDs.AIR];
         for (int i = 0; i < 4096; i++) {
             int ordinal = set[i];
-            ordinal = Math.max(ordinal, BlockTypesCache.ReservedIDs.AIR);
             int palette = blockToPalette[ordinal];
             blocksCopy[i] = palette;
         }
+        blockToPalette[BlockTypesCache.ReservedIDs.__RESERVED__] = oldVal;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -86,12 +86,14 @@ private static void mapPalette(`
`86`	`86`	`System.arraycopy(adapter.getIbdToOrdinal(), 0, paletteToBlock, 0, adapter.getIbdToOrdinal().length);`
`87`	`87`	`System.arraycopy(adapter.getOrdinalToIbdID(), 0, blockToPalette, 0, adapter.getOrdinalToIbdID().length);`
`88`	`88`	`}`
	`89`	`+ int oldVal = blockToPalette[BlockTypesCache.ReservedIDs.__RESERVED__];`
	`90`	`+ blockToPalette[BlockTypesCache.ReservedIDs.__RESERVED__] = blockToPalette[BlockTypesCache.ReservedIDs.AIR];`
`89`	`91`	`for (int i = 0; i < 4096; i++) {`
`90`	`92`	`int ordinal = set[i];`
`91`		`- ordinal = Math.max(ordinal, BlockTypesCache.ReservedIDs.AIR);`
`92`	`93`	`int palette = blockToPalette[ordinal];`
`93`	`94`	`blocksCopy[i] = palette;`
`94`	`95`	`}`
	`96`	`+ blockToPalette[BlockTypesCache.ReservedIDs.__RESERVED__] = oldVal;`
`95`	`97`	`}`
`96`	`98`
`97`	`99`	`@Override`