geforkt von Mirrors/Paper
8f9df2ed43
Undo the accidental renaming of a method in0aad8bfAikar wanted to rename DataPalette#getDataBits(T object) to getOrCreateIdFor in0aad8bfbut he also accidentally renamed ChunkPacketInfo#getDataBitsIndex(int chunkSectionIndex) to getOrCreateIdForIndex. Remove chunk-edge-mode and chunk loading entirely from Anti-Xray The chunk-edge-mode is broken since several versions. Loading chunk neighbors for chunk edge obfuscation isn't needed anymore. Unlike in previous versions, these are under normal circumstances already loaded at the time we need them (plugins for example can bypass this). Use the modified methods and constructors everywhere Anti-Xray provides support for the default nms methods and constructors, which where modified by Anti-Xray to avoid breaking stuff (plugins) which somehow uses these methods. However, the modified versions of those methods and constructors should be used where possible.
114 Zeilen
6.1 KiB
Diff
114 Zeilen
6.1 KiB
Diff
From d792a6e7f49015ded97c2eb2d41c930cf246395a Mon Sep 17 00:00:00 2001
|
|
From: Phoenix616 <mail@moep.tv>
|
|
Date: Mon, 13 Jan 2020 15:40:32 +0100
|
|
Subject: [PATCH] Seed based feature search
|
|
|
|
This fixes the issue where the server will load surrounding chunks up to
|
|
a radius of 100 chunks in order to search for features e.g. when running
|
|
the /locate command or for treasure maps (issue #2312).
|
|
This is done by using the same seed checking functionality that is used
|
|
by the server when generating these features before actually attempting
|
|
to load the chunk to check if a feature is available in it.
|
|
|
|
The only downside of this is that it breaks once the seed or generator
|
|
changes but this should usually not happen. A config option to disable
|
|
this improvement is added though in case that should ever be necessary.
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index fca4b6e20ab..ade7af40eff 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -357,6 +357,12 @@ public class PaperWorldConfig {
|
|
}
|
|
}
|
|
|
|
+ public boolean seedBasedFeatureSearch = true;
|
|
+ private void seedBasedFeatureSearch() {
|
|
+ seedBasedFeatureSearch = getBoolean("seed-based-feature-search", seedBasedFeatureSearch);
|
|
+ log("Feature search is based on seed: " + seedBasedFeatureSearch);
|
|
+ }
|
|
+
|
|
public int maxCollisionsPerEntity;
|
|
private void maxEntityCollision() {
|
|
maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
|
|
diff --git a/src/main/java/net/minecraft/server/BiomeManager.java b/src/main/java/net/minecraft/server/BiomeManager.java
|
|
index e96f544f126..68423645df3 100644
|
|
--- a/src/main/java/net/minecraft/server/BiomeManager.java
|
|
+++ b/src/main/java/net/minecraft/server/BiomeManager.java
|
|
@@ -12,10 +12,12 @@ public class BiomeManager {
|
|
this.c = genlayerzoomer;
|
|
}
|
|
|
|
+ public BiomeManager withProvider(WorldChunkManager worldchunkmanager) { return a(worldchunkmanager); } // Paper - OBFHELPER
|
|
public BiomeManager a(WorldChunkManager worldchunkmanager) {
|
|
return new BiomeManager(worldchunkmanager, this.b, this.c);
|
|
}
|
|
|
|
+ public BiomeBase getBiome(BlockPosition blockposition) { return a(blockposition); } // Paper - OBFHELPER
|
|
public BiomeBase a(BlockPosition blockposition) {
|
|
return this.c.a(this.b, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this.a);
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
|
|
index f2a19acd845..09f1308b0d0 100644
|
|
--- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
|
|
+++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
|
|
@@ -64,10 +64,12 @@ public class ChunkCoordIntPair {
|
|
}
|
|
}
|
|
|
|
+ public int getBlockX() { return d(); } // Paper - OBFHELPER
|
|
public int d() {
|
|
return this.x << 4;
|
|
}
|
|
|
|
+ public int getBlockZ() { return e(); } // Paper - OBFHELPER
|
|
public int e() {
|
|
return this.z << 4;
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
|
|
index e8ce2ecf23e..acfe732af5b 100644
|
|
--- a/src/main/java/net/minecraft/server/StructureGenerator.java
|
|
+++ b/src/main/java/net/minecraft/server/StructureGenerator.java
|
|
@@ -109,6 +109,15 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
|
|
if (flag1 || flag2) {
|
|
ChunkCoordIntPair chunkcoordintpair = this.a(chunkgenerator, seededrandom, j, k, i1, j1);
|
|
if (!world.getWorldBorder().isChunkInBounds(chunkcoordintpair.x, chunkcoordintpair.z)) { continue; } // Paper
|
|
+ // Paper start - seed based feature search
|
|
+ if (world.paperConfig.seedBasedFeatureSearch) {
|
|
+ BiomeManager biomeManager = world.getBiomeManager().withProvider(chunkgenerator.getWorldChunkManager());
|
|
+ BiomeBase biomeBase = biomeManager.getBiome(new BlockPosition(chunkcoordintpair.getBlockX() + 9, 0, chunkcoordintpair.getBlockZ() + 9));
|
|
+ if (!shouldGenerate(biomeManager, chunkgenerator, seededrandom, chunkcoordintpair.x, chunkcoordintpair.z, biomeBase)) {
|
|
+ continue;
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
StructureStart structurestart = world.getChunkAt(chunkcoordintpair.x, chunkcoordintpair.z, ChunkStatus.STRUCTURE_STARTS).a(this.b());
|
|
|
|
if (structurestart != null && structurestart.e()) {
|
|
@@ -165,6 +174,7 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
|
|
return new ChunkCoordIntPair(i + k, j + l);
|
|
}
|
|
|
|
+ public boolean shouldGenerate(BiomeManager biomemanager, ChunkGenerator<?> chunkgenerator, Random random, int chunkX, int chunkZ, BiomeBase biomebase) { return a(biomemanager, chunkgenerator, random, chunkX, chunkZ, biomebase); } // Paper - OBFHELPER
|
|
public abstract boolean a(BiomeManager biomemanager, ChunkGenerator<?> chunkgenerator, Random random, int i, int j, BiomeBase biomebase);
|
|
|
|
public abstract StructureGenerator.a a();
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index 228e6e9ab99..f1d072a39cc 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -1569,8 +1569,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
|
return this.methodProfiler;
|
|
}
|
|
|
|
- @Override
|
|
- public BiomeManager d() {
|
|
+ public BiomeManager getBiomeManager() { return d(); } // Paper - OBFHELPER
|
|
+ @Override public BiomeManager d() {
|
|
return this.biomeManager;
|
|
}
|
|
}
|
|
--
|
|
2.26.2
|
|
|