mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 12:27:59 +01:00
77a5779e24
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 2ec53f49 PR-1050: Fix empty result check for Complex Recipes 10671012 PR-1044: Add CrafterCraftEvent 4d87ffe0 Use correct method in JavaDoc ae5e5817 SPIGOT-7850: Add API for Bogged shear state 46b6d445 SPIGOT-7837: Support data pack banner patterns d5d0cefc Fix JavaDoc error b3c2b83d PR-1036: Add API for InventoryView derivatives 1fe2c75a SPIGOT-7809: Add ShieldMeta CraftBukkit Changes: 8ee6fd1b8 SPIGOT-7857: Improve ItemMeta block data deserialization 8f26c30c6 SPIGOT-7857: Fix spurious internal NBT tag when deserializing BlockStateMeta 759061b93 SPIGOT-7855: Fire does not spread or burn blocks 00fc9fb64 SPIGOT-7853: AnvilInventory#getRepairCost() always returns 0 7501e2e04 PR-1450: Add CrafterCraftEvent 8c51673e7 SPIGOT-5731: PortalCreateEvent#getEntity returns null for nether portals ignited by flint and steel d53d0d0b1 PR-1456: Fix inverted logic in CraftCrafterView#setSlotDisabled 682a678c8 SPIGOT-7850: Add API for Bogged shear state fccf5243a SPIGOT-7837: Support data pack banner patterns 9c3bd4390 PR-1431: Add API for InventoryView derivatives 0cc6acbc4 SPIGOT-7849: Fix FoodComponent serialize with "using-converts-to" using null 2c5474952 Don't rely on tags for CraftItemMetas 20d107e46 SPIGOT-7846: Fix ItemMeta for hanging signs 76f59e315 Remove redundant clone in Dropper InventoryMoveItemEvent e61a53d25 SPIGOT-7817: Call InventoryMoveItemEvent for Crafters 894682e2d SPIGOT-7839: Remove redundant Java version checks 2c12b2187 SPIGOT-7809: Add ShieldMeta and fix setting shield base colours Spigot Changes: fb8fb722 Rebuild patches 34bd42b7 SPIGOT-7835: Fix issue with custom hopper settings
40 lines
2.3 KiB
Diff
40 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Date: Mon, 21 Aug 2023 21:05:09 +0200
|
|
Subject: [PATCH] Optimize nearest structure border iteration
|
|
|
|
Getting the nearest generated structure contains a nested set of loops that
|
|
iterates over all chunks at a specific chessboard distance. It does this by
|
|
iterating over the entire square of chunks within that distance, and checking
|
|
if the coordinates are at exactly the right distance to be on the border.
|
|
|
|
This patch optimizes the iteration by only iterating over the border chunks.
|
|
This evaluated chunks are the same, and in the same order, as before, to
|
|
ensure that the returned found structure (which may for example be a buried
|
|
treasure that will be marked on a treasure map) is the same as in vanilla.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
|
|
index 102de569415ef011dacdca9a6ea8134d0ef62454..29697fad32dad3377eebc82d280ba48d3c1ad516 100644
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
|
|
@@ -265,12 +265,15 @@ public abstract class ChunkGenerator {
|
|
int i1 = placement.spacing();
|
|
|
|
for (int j1 = -radius; j1 <= radius; ++j1) {
|
|
- boolean flag1 = j1 == -radius || j1 == radius;
|
|
+ // Paper start - Perf: iterate over border chunks instead of entire square chunk area
|
|
+ boolean flag1 = j1 == -radius || j1 == radius; final boolean onBorderAlongZAxis = flag1; // Paper - OBFHELPER
|
|
|
|
- for (int k1 = -radius; k1 <= radius; ++k1) {
|
|
- boolean flag2 = k1 == -radius || k1 == radius;
|
|
+ for (int k1 = -radius; k1 <= radius; k1 += onBorderAlongZAxis ? 1 : radius * 2) {
|
|
+ // boolean flag2 = k1 == -radius || k1 == radius;
|
|
|
|
- if (flag1 || flag2) {
|
|
+ // if (flag1 || flag2) {
|
|
+ if (true) {
|
|
+ // Paper end - Perf: iterate over border chunks instead of entire square chunk area
|
|
int l1 = centerChunkX + i1 * j1;
|
|
int i2 = centerChunkZ + i1 * k1;
|
|
ChunkPos chunkcoordintpair = placement.getPotentialStructureChunk(seed, l1, i2);
|