twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-31 04:13:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

SPIGOT-7207: WorldCreator creates world as super flat even when normal is specified

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2022-12-14 13:47:32 +11:00
parent 4fcfe1390d
commit eb88aa7b90
5 changed files with 119 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
paper-server/nms-patches/net/minecraft/server/level/WorldServer.patch
View File

@@ -36,32 +36,34 @@
final EntityTickList entityTickList;
public final PersistentEntitySectionManager<Entity> entityManager;
private final GameEventDispatcher gameEventDispatcher;
@@ -197,11 +217,28 @@
@@ -197,11 +217,30 @@
private final StructureCheck structureCheck;
private final boolean tickTime;
- public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, IWorldDataServer iworlddataserver, ResourceKey<World> resourcekey, WorldDimension worlddimension, WorldLoadListener worldloadlistener, boolean flag, long i, List<MobSpawner> list, boolean flag1) {
- Holder holder = worlddimension.type();
+ // CraftBukkit start
+ private final IRegistryCustom registries;
+ public final Convertable.ConversionSession convertable;
+ public final UUID uuid;
+
+ public Chunk getChunkIfLoaded(int x, int z) {
+ return this.chunkSource.getChunk(x, z, false);
+ }
+
- Objects.requireNonNull(minecraftserver);
- super(iworlddataserver, resourcekey, holder, minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates());
+ @Override
+ public ResourceKey<WorldDimension> getTypeKey() {
+ return convertable.dimensionType;
+ }
- Objects.requireNonNull(minecraftserver);
- super(iworlddataserver, resourcekey, holder, minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates());
+
+ // Add env and gen to constructor, IWorldDataServer -> WorldDataServer
+ public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, WorldDataServer iworlddataserver, ResourceKey<World> resourcekey, WorldDimension worlddimension, WorldLoadListener worldloadlistener, boolean flag, long i, List<MobSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
+ public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, WorldDataServer iworlddataserver, ResourceKey<World> resourcekey, WorldDimension worlddimension, WorldLoadListener worldloadlistener, boolean flag, long i, List<MobSpawner> list, boolean flag1, IRegistryCustom registries, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
+ // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
+ // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
+ super(iworlddataserver, resourcekey, worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env);
+ this.registries = registries;
+ this.pvpMode = minecraftserver.isPvpAllowed();
+ convertable = convertable_conversionsession;
+ uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
@@ -69,7 +71,7 @@
this.players = Lists.newArrayList();
this.entityTickList = new EntityTickList();
this.blockTicks = new TickListServer<>(this::isPositionTickingWithEntitiesLoaded, this.getProfilerSupplier());
@@ -215,6 +252,22 @@
@@ -215,6 +254,22 @@
this.customSpawners = list;
this.serverLevelData = iworlddataserver;
ChunkGenerator chunkgenerator = worlddimension.generator();
@@ -92,7 +94,7 @@
boolean flag2 = minecraftserver.forceSynchronousWrites();
DataFixer datafixer = minecraftserver.getFixerUpper();
EntityPersistentStorage<Entity> entitypersistentstorage = new EntityStorage(this, convertable_conversionsession.getDimensionPath(resourcekey).resolve("entities"), datafixer, flag2, minecraftserver);
@@ -246,15 +299,16 @@
@@ -246,15 +301,16 @@
long l = minecraftserver.getWorldData().worldGenOptions().seed();
this.structureCheck = new StructureCheck(this.chunkSource.chunkScanner(), this.registryAccess(), minecraftserver.getStructureManager(), resourcekey, chunkgenerator, this.chunkSource.randomState(), this, chunkgenerator.getBiomeSource(), l, datafixer);
@@ -112,7 +114,7 @@
}
public void setWeatherParameters(int i, int j, boolean flag, boolean flag1) {
@@ -286,12 +340,20 @@
@@ -286,12 +342,20 @@
long j;
if (this.sleepStatus.areEnoughSleeping(i) && this.sleepStatus.areEnoughDeepSleeping(i, this.players)) {
@@ -136,7 +138,7 @@
if (this.getGameRules().getBoolean(GameRules.RULE_WEATHER_CYCLE) && this.isRaining()) {
this.resetWeatherCycle();
}
@@ -317,7 +379,7 @@
@@ -317,7 +381,7 @@
this.runBlockEvents();
this.handlingTick = false;
gameprofilerfiller.pop();
@@ -145,7 +147,7 @@
if (flag) {
this.resetEmptyTime();
@@ -333,7 +395,7 @@
@@ -333,7 +397,7 @@
this.entityTickList.forEach((entity) -> {
if (!entity.isRemoved()) {
@@ -154,7 +156,7 @@
entity.discard();
} else {
gameprofilerfiller.push("checkDespawn");
@@ -405,7 +467,7 @@
@@ -405,7 +469,7 @@
private void wakeUpAllPlayers() {
this.sleepStatus.removeAllSleepers();
@@ -163,7 +165,7 @@
entityplayer.stopSleepInBed(false, false);
});
}
@@ -433,7 +495,7 @@
@@ -433,7 +497,7 @@
entityhorseskeleton.setTrap(true);
entityhorseskeleton.setAge(0);
entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
@@ -172,7 +174,7 @@
}
}
@@ -442,7 +504,7 @@
@@ -442,7 +506,7 @@
if (entitylightning != null) {
entitylightning.moveTo(Vec3D.atBottomCenterOf(blockposition));
entitylightning.setVisualOnly(flag1);
@@ -181,7 +183,7 @@
}
}
}
@@ -456,7 +518,7 @@
@@ -456,7 +520,7 @@
BiomeBase biomebase = (BiomeBase) this.getBiome(blockposition).value();
if (biomebase.shouldFreeze(this, blockposition1)) {
@@ -190,7 +192,7 @@
}
if (flag) {
@@ -471,10 +533,10 @@
@@ -471,10 +535,10 @@
IBlockData iblockdata1 = (IBlockData) iblockdata.setValue(BlockSnow.LAYERS, l + 1);
Block.pushEntitiesUp(iblockdata, iblockdata1, this, blockposition);
@@ -203,7 +205,7 @@
}
}
@@ -671,6 +733,7 @@
@@ -671,6 +735,7 @@
this.rainLevel = MathHelper.clamp(this.rainLevel, 0.0F, 1.0F);
}
@@ -211,7 +213,7 @@
if (this.oRainLevel != this.rainLevel) {
this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel), this.dimension());
}
@@ -689,14 +752,47 @@
@@ -689,14 +754,47 @@
this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel));
this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.THUNDER_LEVEL_CHANGE, this.thunderLevel));
}
@@ -261,7 +263,7 @@
}
public void resetEmptyTime() {
@@ -731,6 +827,7 @@
@@ -731,6 +829,7 @@
});
gameprofilerfiller.incrementCounter("tickNonPassenger");
entity.tick();
@@ -269,7 +271,7 @@
this.getProfiler().pop();
Iterator iterator = entity.getPassengers().iterator();
@@ -754,6 +851,7 @@
@@ -754,6 +853,7 @@
});
gameprofilerfiller.incrementCounter("tickPassenger");
entity1.rideTick();
@@ -277,7 +279,7 @@
gameprofilerfiller.pop();
Iterator iterator = entity1.getPassengers().iterator();
@@ -778,6 +876,7 @@
@@ -778,6 +878,7 @@
ChunkProviderServer chunkproviderserver = this.getChunkSource();
if (!flag1) {
@@ -285,7 +287,7 @@
if (iprogressupdate != null) {
iprogressupdate.progressStartNoAbort(IChatBaseComponent.translatable("menu.savingLevel"));
}
@@ -795,11 +894,19 @@
@@ -795,11 +896,19 @@
}
}
@@ -295,7 +297,7 @@
+
+ serverLevelData.setWorldBorder(worldserver1.getWorldBorder().createSettings());
+ serverLevelData.setCustomBossEvents(this.server.getCustomBossEvents().save());
+ convertable.saveDataTag(this.server.registryAccess(), this.serverLevelData, this.server.getPlayerList().getSingleplayerData());
+ convertable.saveDataTag(this.registries, this.serverLevelData, this.server.getPlayerList().getSingleplayerData());
+ // CraftBukkit end
}
@@ -306,7 +308,7 @@
}
this.getChunkSource().getDataStorage().save();
@@ -864,15 +971,37 @@
@@ -864,15 +973,37 @@
@Override
public boolean addFreshEntity(Entity entity) {
@@ -347,7 +349,7 @@
}
public void addDuringCommandTeleport(EntityPlayer entityplayer) {
@@ -903,24 +1032,37 @@
@@ -903,24 +1034,37 @@
this.entityManager.addNewEntity(entityplayer);
}
@@ -389,7 +391,7 @@
return true;
}
}
@@ -934,10 +1076,32 @@
@@ -934,10 +1078,32 @@
entityplayer.remove(entity_removalreason);
}
@@ -422,7 +424,7 @@
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -946,6 +1110,12 @@
@@ -946,6 +1112,12 @@
double d1 = (double) blockposition.getY() - entityplayer.getY();
double d2 = (double) blockposition.getZ() - entityplayer.getZ();
@@ -435,7 +437,7 @@
if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {
entityplayer.connection.send(new PacketPlayOutBlockBreakAnimation(i, blockposition, j));
}
@@ -1005,7 +1175,18 @@
@@ -1005,7 +1177,18 @@
Iterator iterator = this.navigatingMobs.iterator();
while (iterator.hasNext()) {
@@ -455,7 +457,7 @@
NavigationAbstract navigationabstract = entityinsentient.getNavigation();
if (navigationabstract.shouldRecomputePath(blockposition)) {
@@ -1062,6 +1243,11 @@
@@ -1062,6 +1245,11 @@
@Override
public Explosion explode(@Nullable Entity entity, @Nullable DamageSource damagesource, @Nullable ExplosionDamageCalculator explosiondamagecalculator, double d0, double d1, double d2, float f, boolean flag, World.a world_a) {
Explosion explosion = this.explode(entity, damagesource, explosiondamagecalculator, d0, d1, d2, f, flag, world_a, false);
@@ -467,7 +469,7 @@
if (!explosion.interactsWithBlocks()) {
explosion.clearToBlow();
@@ -1134,13 +1320,20 @@
@@ -1134,13 +1322,20 @@
}
public <T extends ParticleParam> int sendParticles(T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6) {
@@ -490,7 +492,7 @@
++j;
}
}
@@ -1191,7 +1384,7 @@
@@ -1191,7 +1386,7 @@
@Nullable
public BlockPosition findNearestMapStructure(TagKey<Structure> tagkey, BlockPosition blockposition, int i, boolean flag) {
@@ -499,7 +501,7 @@
return null;
} else {
Optional<HolderSet.Named<Structure>> optional = this.registryAccess().registryOrThrow(Registries.STRUCTURE).getTag(tagkey);
@@ -1233,11 +1426,21 @@
@@ -1233,11 +1428,21 @@
@Nullable
@Override
public WorldMap getMapData(String s) {
@@ -522,7 +524,7 @@
this.getServer().overworld().getDataStorage().set(s, worldmap);
}
@@ -1535,6 +1738,11 @@
@@ -1535,6 +1740,11 @@
@Override
public void blockUpdated(BlockPosition blockposition, Block block) {
if (!this.isDebug()) {
@@ -534,7 +536,7 @@
this.updateNeighborsAt(blockposition, block);
}
@@ -1554,12 +1762,12 @@
@@ -1554,12 +1764,12 @@
}
public boolean isFlat() {
@@ -549,7 +551,7 @@
}
@Nullable
@@ -1582,7 +1790,7 @@
@@ -1582,7 +1792,7 @@
private static <T> String getTypeCount(Iterable<T> iterable, Function<T, String> function) {
try {
Object2IntOpenHashMap<String> object2intopenhashmap = new Object2IntOpenHashMap();
@@ -558,7 +560,7 @@
while (iterator.hasNext()) {
T t0 = iterator.next();
@@ -1591,7 +1799,7 @@
@@ -1591,7 +1801,7 @@
object2intopenhashmap.addTo(s, 1);
}
@@ -567,7 +569,7 @@
String s1 = (String) entry.getKey();
return s1 + ":" + entry.getIntValue();
@@ -1602,17 +1810,33 @@
@@ -1602,17 +1812,33 @@
}
public static void makeObsidianPlatform(WorldServer worldserver) {
@@ -603,7 +605,7 @@
}
@Override
@@ -1728,6 +1952,7 @@
@@ -1728,6 +1954,7 @@
}
entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
@@ -611,7 +613,7 @@
}
public void onTrackingEnd(Entity entity) {
@@ -1764,6 +1989,14 @@
@@ -1764,6 +1991,14 @@
}
entity.updateDynamicGameEventListener(DynamicGameEventListener::remove);