--- a/net/minecraft/server/level/WorldServer.java +++ b/net/minecraft/server/level/WorldServer.java @@ -152,6 +152,26 @@ import net.minecraft.world.ticks.TickListServer; import org.slf4j.Logger; +// CraftBukkit start +import net.minecraft.world.level.biome.WorldChunkManager; +import net.minecraft.world.level.dimension.WorldDimension; +import net.minecraft.world.level.levelgen.ChunkGeneratorAbstract; +import net.minecraft.world.level.levelgen.ChunkProviderFlat; +import net.minecraft.world.level.storage.WorldDataServer; +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.WeatherType; +import org.bukkit.craftbukkit.event.CraftEventFactory; +import org.bukkit.craftbukkit.generator.CustomWorldChunkManager; +import org.bukkit.craftbukkit.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.util.WorldUUID; +import org.bukkit.event.entity.CreatureSpawnEvent; +import org.bukkit.event.server.MapInitializeEvent; +import org.bukkit.event.weather.LightningStrikeEvent; +import org.bukkit.event.world.GenericGameEvent; +import org.bukkit.event.world.TimeSkipEvent; +// CraftBukkit end + public class WorldServer extends World implements GeneratorAccessSeed { public static final BlockPosition END_SPAWN_POINT = new BlockPosition(100, 50, 0); @@ -169,7 +189,7 @@ final List players; private final ChunkProviderServer chunkSource; private final MinecraftServer server; - public final IWorldDataServer serverLevelData; + public final WorldDataServer serverLevelData; // CraftBukkit - type final EntityTickList entityTickList; public final PersistentEntitySectionManager entityManager; public boolean noSave; @@ -193,11 +213,28 @@ private final StructureCheck structureCheck; private final boolean tickTime; - public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, IWorldDataServer iworlddataserver, ResourceKey resourcekey, WorldDimension worlddimension, WorldLoadListener worldloadlistener, boolean flag, long i, List list, boolean flag1) { - Holder holder = worlddimension.typeHolder(); + // CraftBukkit start + public final Convertable.ConversionSession convertable; + public final UUID uuid; + + public Chunk getChunkIfLoaded(int x, int z) { + return this.chunkSource.getChunk(x, z, false); + } + + @Override + public ResourceKey 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 resourcekey, WorldDimension worlddimension, WorldLoadListener worldloadlistener, boolean flag, long i, List list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { + // Holder holder = worlddimension.typeHolder(); // CraftBukkit - decompile error + // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error + super(iworlddataserver, resourcekey, worlddimension.typeHolder(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env); + this.pvpMode = minecraftserver.isPvpAllowed(); + convertable = convertable_conversionsession; + uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile()); + // CraftBukkit end this.players = Lists.newArrayList(); this.entityTickList = new EntityTickList(); this.blockTicks = new TickListServer<>(this::isPositionTickingWithEntitiesLoaded, this.getProfilerSupplier()); @@ -212,6 +249,22 @@ this.customSpawners = list; this.serverLevelData = iworlddataserver; ChunkGenerator chunkgenerator = worlddimension.generator(); + // CraftBukkit start + serverLevelData.setWorld(this); + + if (biomeProvider != null) { + WorldChunkManager worldChunkManager = new CustomWorldChunkManager(getWorld(), biomeProvider, server.registryHolder.registryOrThrow(IRegistry.BIOME_REGISTRY)); + if (chunkgenerator instanceof ChunkGeneratorAbstract cga) { + chunkgenerator = new ChunkGeneratorAbstract(cga.structureSets, cga.noises, worldChunkManager, cga.settings); + } else if (chunkgenerator instanceof ChunkProviderFlat cpf) { + chunkgenerator = new ChunkProviderFlat(cpf.structureSets, cpf.settings(), worldChunkManager); + } + } + + if (gen != null) { + chunkgenerator = new org.bukkit.craftbukkit.generator.CustomChunkGenerator(this, chunkgenerator, gen); + } + // CraftBukkit end boolean flag2 = minecraftserver.forceSynchronousWrites(); DataFixer datafixer = minecraftserver.getFixerUpper(); EntityPersistentStorage entitypersistentstorage = new EntityStorage(this, convertable_conversionsession.getDimensionPath(resourcekey).resolve("entities"), datafixer, flag2, minecraftserver); @@ -243,14 +296,15 @@ long l = minecraftserver.getWorldData().worldGenSettings().seed(); this.structureCheck = new StructureCheck(this.chunkSource.chunkScanner(), this.registryAccess(), minecraftserver.getStructureManager(), resourcekey, chunkgenerator, this.chunkSource.randomState(), this, chunkgenerator.getBiomeSource(), l, datafixer); - this.structureManager = new StructureManager(this, minecraftserver.getWorldData().worldGenSettings(), this.structureCheck); - if (this.dimension() == World.END && this.dimensionTypeRegistration().is(BuiltinDimensionTypes.END)) { - this.dragonFight = new EnderDragonBattle(this, l, minecraftserver.getWorldData().endDragonFightData()); + this.structureManager = new StructureManager(this, this.serverLevelData.worldGenSettings(), structureCheck); // CraftBukkit + if ((this.dimension() == World.END && this.dimensionTypeRegistration().is(BuiltinDimensionTypes.END)) || env == org.bukkit.World.Environment.THE_END) { // CraftBukkit - Allow to create EnderDragonBattle in default and custom END + this.dragonFight = new EnderDragonBattle(this, this.serverLevelData.worldGenSettings().seed(), this.serverLevelData.endDragonFightData()); // CraftBukkit } else { this.dragonFight = null; } this.sleepStatus = new SleepStatus(); + this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit } public void setWeatherParameters(int i, int j, boolean flag, boolean flag1) { @@ -282,12 +336,20 @@ long j; if (this.sleepStatus.areEnoughSleeping(i) && this.sleepStatus.areEnoughDeepSleeping(i, this.players)) { + // CraftBukkit start + j = this.levelData.getDayTime() + 24000L; + TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (j - j % 24000L) - this.getDayTime()); if (this.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) { - j = this.levelData.getDayTime() + 24000L; - this.setDayTime(j - j % 24000L); + getCraftServer().getPluginManager().callEvent(event); + if (!event.isCancelled()) { + this.setDayTime(this.getDayTime() + event.getSkipAmount()); + } } - this.wakeUpAllPlayers(); + if (!event.isCancelled()) { + this.wakeUpAllPlayers(); + } + // CraftBukkit end if (this.getGameRules().getBoolean(GameRules.RULE_WEATHER_CYCLE) && this.isRaining()) { this.resetWeatherCycle(); } @@ -313,7 +375,7 @@ this.runBlockEvents(); this.handlingTick = false; gameprofilerfiller.pop(); - boolean flag = !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); + boolean flag = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players if (flag) { this.resetEmptyTime(); @@ -329,7 +391,7 @@ this.entityTickList.forEach((entity) -> { if (!entity.isRemoved()) { - if (this.shouldDiscardEntity(entity)) { + if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed entity.discard(); } else { gameprofilerfiller.push("checkDespawn"); @@ -403,7 +465,7 @@ private void wakeUpAllPlayers() { this.sleepStatus.removeAllSleepers(); - ((List) this.players.stream().filter(EntityLiving::isSleeping).collect(Collectors.toList())).forEach((entityplayer) -> { + (this.players.stream().filter(EntityLiving::isSleeping).collect(Collectors.toList())).forEach((entityplayer) -> { // CraftBukkit - decompile error entityplayer.stopSleepInBed(false, false); }); } @@ -430,14 +492,14 @@ entityhorseskeleton.setTrap(true); entityhorseskeleton.setAge(0); entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ()); - this.addFreshEntity(entityhorseskeleton); + this.addFreshEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit } EntityLightning entitylightning = (EntityLightning) EntityTypes.LIGHTNING_BOLT.create(this); entitylightning.moveTo(Vec3D.atBottomCenterOf(blockposition)); entitylightning.setVisualOnly(flag1); - this.addFreshEntity(entitylightning); + this.strikeLightning(entitylightning, org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit } } @@ -448,12 +510,12 @@ BiomeBase biomebase = (BiomeBase) this.getBiome(blockposition).value(); if (biomebase.shouldFreeze(this, blockposition1)) { - this.setBlockAndUpdate(blockposition1, Blocks.ICE.defaultBlockState()); + org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition1, Blocks.ICE.defaultBlockState(), null); // CraftBukkit } if (flag) { if (biomebase.shouldSnow(this, blockposition)) { - this.setBlockAndUpdate(blockposition, Blocks.SNOW.defaultBlockState()); + org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition, Blocks.SNOW.defaultBlockState(), null); // CraftBukkit } IBlockData iblockdata = this.getBlockState(blockposition1); @@ -649,6 +711,7 @@ this.rainLevel = MathHelper.clamp(this.rainLevel, 0.0F, 1.0F); } + /* CraftBukkit start if (this.oRainLevel != this.rainLevel) { this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel), this.dimension()); } @@ -667,14 +730,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)); } + // */ + for (int idx = 0; idx < this.players.size(); ++idx) { + if (((EntityPlayer) this.players.get(idx)).level == this) { + ((EntityPlayer) this.players.get(idx)).tickWeather(); + } + } + + if (flag != this.isRaining()) { + // Only send weather packets to those affected + for (int idx = 0; idx < this.players.size(); ++idx) { + if (((EntityPlayer) this.players.get(idx)).level == this) { + ((EntityPlayer) this.players.get(idx)).setPlayerWeather((!flag ? WeatherType.DOWNFALL : WeatherType.CLEAR), false); + } + } + } + for (int idx = 0; idx < this.players.size(); ++idx) { + if (((EntityPlayer) this.players.get(idx)).level == this) { + ((EntityPlayer) this.players.get(idx)).updateWeather(this.oRainLevel, this.rainLevel, this.oThunderLevel, this.thunderLevel); + } + } + // CraftBukkit end } private void resetWeatherCycle() { - this.serverLevelData.setRainTime(0); + // CraftBukkit start this.serverLevelData.setRaining(false); - this.serverLevelData.setThunderTime(0); + // If we stop due to everyone sleeping we should reset the weather duration to some other random value. + // Not that everyone ever manages to get the whole server to sleep at the same time.... + if (!this.serverLevelData.isRaining()) { + this.serverLevelData.setRainTime(0); + } + // CraftBukkit end this.serverLevelData.setThundering(false); + // CraftBukkit start + // If we stop due to everyone sleeping we should reset the weather duration to some other random value. + // Not that everyone ever manages to get the whole server to sleep at the same time.... + if (!this.serverLevelData.isThundering()) { + this.serverLevelData.setThunderTime(0); + } + // CraftBukkit end } public void resetEmptyTime() { @@ -709,6 +805,7 @@ }); gameprofilerfiller.incrementCounter("tickNonPassenger"); entity.tick(); + entity.postTick(); // CraftBukkit this.getProfiler().pop(); Iterator iterator = entity.getPassengers().iterator(); @@ -732,6 +829,7 @@ }); gameprofilerfiller.incrementCounter("tickPassenger"); entity1.rideTick(); + entity1.postTick(); // CraftBukkit gameprofilerfiller.pop(); Iterator iterator = entity1.getPassengers().iterator(); @@ -756,6 +854,7 @@ ChunkProviderServer chunkproviderserver = this.getChunkSource(); if (!flag1) { + org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit if (iprogressupdate != null) { iprogressupdate.progressStartNoAbort(IChatBaseComponent.translatable("menu.savingLevel")); } @@ -773,11 +872,19 @@ } } + + // CraftBukkit start - moved from MinecraftServer.saveChunks + WorldServer worldserver1 = this; + + serverLevelData.setWorldBorder(worldserver1.getWorldBorder().createSettings()); + serverLevelData.setCustomBossEvents(this.server.getCustomBossEvents().save()); + convertable.saveDataTag(this.server.registryHolder, this.serverLevelData, this.server.getPlayerList().getSingleplayerData()); + // CraftBukkit end } private void saveLevelData() { if (this.dragonFight != null) { - this.server.getWorldData().setEndDragonFightData(this.dragonFight.saveData()); + this.serverLevelData.setEndDragonFightData(this.dragonFight.saveData()); // CraftBukkit } this.getChunkSource().getDataStorage().save(); @@ -823,15 +930,37 @@ @Override public boolean addFreshEntity(Entity entity) { - return this.addEntity(entity); + // CraftBukkit start + return this.addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.DEFAULT); + } + + @Override + public boolean addFreshEntity(Entity entity, CreatureSpawnEvent.SpawnReason reason) { + return this.addEntity(entity, reason); + // CraftBukkit end } public boolean addWithUUID(Entity entity) { - return this.addEntity(entity); + // CraftBukkit start + return this.addWithUUID(entity, CreatureSpawnEvent.SpawnReason.DEFAULT); + } + + public boolean addWithUUID(Entity entity, CreatureSpawnEvent.SpawnReason reason) { + return this.addEntity(entity, reason); + // CraftBukkit end } public void addDuringTeleport(Entity entity) { - this.addEntity(entity); + // CraftBukkit start + // SPIGOT-6415: Don't call spawn event for entities which travel trough worlds, + // since it is only an implementation detail, that a new entity is created when + // they are traveling between worlds. + this.addDuringTeleport(entity, null); + } + + public void addDuringTeleport(Entity entity, CreatureSpawnEvent.SpawnReason reason) { + this.addEntity(entity, reason); + // CraftBukkit end } public void addDuringCommandTeleport(EntityPlayer entityplayer) { @@ -862,24 +991,37 @@ this.entityManager.addNewEntity(entityplayer); } - private boolean addEntity(Entity entity) { + // CraftBukkit start + private boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) { if (entity.isRemoved()) { - WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); + // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit return false; } else { + // SPIGOT-6415: Don't call spawn event when reason is null. For example when an entity teleports to a new world. + if (spawnReason != null && !CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) { + return false; + } + // CraftBukkit end + return this.entityManager.addNewEntity(entity); } } public boolean tryAddFreshEntityWithPassengers(Entity entity) { - Stream stream = entity.getSelfAndPassengers().map(Entity::getUUID); + // CraftBukkit start + return this.tryAddFreshEntityWithPassengers(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT); + } + + public boolean tryAddFreshEntityWithPassengers(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) { + // CraftBukkit end + Stream stream = entity.getSelfAndPassengers().map(Entity::getUUID); // CraftBukkit - decompile error PersistentEntitySectionManager persistententitysectionmanager = this.entityManager; Objects.requireNonNull(this.entityManager); if (stream.anyMatch(persistententitysectionmanager::isLoaded)) { return false; } else { - this.addFreshEntityWithPassengers(entity); + this.addFreshEntityWithPassengers(entity, reason); // CraftBukkit return true; } } @@ -893,10 +1035,32 @@ entityplayer.remove(entity_removalreason); } + // CraftBukkit start + public boolean strikeLightning(Entity entitylightning) { + return this.strikeLightning(entitylightning, LightningStrikeEvent.Cause.UNKNOWN); + } + + public boolean strikeLightning(Entity entitylightning, LightningStrikeEvent.Cause cause) { + LightningStrikeEvent lightning = CraftEventFactory.callLightningStrikeEvent((org.bukkit.entity.LightningStrike) entitylightning.getBukkitEntity(), cause); + + if (lightning.isCancelled()) { + return false; + } + + return this.addFreshEntity(entitylightning); + } + // CraftBukkit end + @Override public void destroyBlockProgress(int i, BlockPosition blockposition, int j) { Iterator iterator = this.server.getPlayerList().getPlayers().iterator(); + // CraftBukkit start + EntityHuman entityhuman = null; + Entity entity = this.getEntity(i); + if (entity instanceof EntityHuman) entityhuman = (EntityHuman) entity; + // CraftBukkit end + while (iterator.hasNext()) { EntityPlayer entityplayer = (EntityPlayer) iterator.next(); @@ -905,6 +1069,12 @@ double d1 = (double) blockposition.getY() - entityplayer.getY(); double d2 = (double) blockposition.getZ() - entityplayer.getZ(); + // CraftBukkit start + if (entityhuman != null && !entityplayer.getBukkitEntity().canSee(entityhuman.getBukkitEntity())) { + continue; + } + // CraftBukkit end + if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) { entityplayer.connection.send(new PacketPlayOutBlockBreakAnimation(i, blockposition, j)); } @@ -941,6 +1111,14 @@ public void gameEvent(GameEvent gameevent, Vec3D vec3d, GameEvent.a gameevent_a) { int i = gameevent.getNotificationRadius(); BlockPosition blockposition = new BlockPosition(vec3d); + // CraftBukkit start + GenericGameEvent event = new GenericGameEvent(org.bukkit.GameEvent.getByKey(CraftNamespacedKey.fromMinecraft(IRegistry.GAME_EVENT.getKey(gameevent))), new Location(this.getWorld(), blockposition.getX(), blockposition.getY(), blockposition.getZ()), (gameevent_a.sourceEntity() == null) ? null : gameevent_a.sourceEntity().getBukkitEntity(), i, !Bukkit.isPrimaryThread()); + getCraftServer().getPluginManager().callEvent(event); + if (event.isCancelled()) { + return; + } + i = event.getRadius(); + // CraftBukkit end int j = SectionPosition.blockToSectionCoord(blockposition.getX() - i); int k = SectionPosition.blockToSectionCoord(blockposition.getY() - i); int l = SectionPosition.blockToSectionCoord(blockposition.getZ() - i); @@ -1013,7 +1191,18 @@ Iterator iterator = this.navigatingMobs.iterator(); while (iterator.hasNext()) { - EntityInsentient entityinsentient = (EntityInsentient) iterator.next(); + // CraftBukkit start - fix SPIGOT-6362 + EntityInsentient entityinsentient; + try { + entityinsentient = (EntityInsentient) iterator.next(); + } catch (java.util.ConcurrentModificationException ex) { + // This can happen because the pathfinder update below may trigger a chunk load, which in turn may cause more navigators to register + // In this case we just run the update again across all the iterators as the chunk will then be loaded + // As this is a relative edge case it is much faster than copying navigators (on either read or write) + sendBlockUpdated(blockposition, iblockdata, iblockdata1, i); + return; + } + // CraftBukkit end NavigationAbstract navigationabstract = entityinsentient.getNavigation(); if (navigationabstract.shouldRecomputePath(blockposition)) { @@ -1069,10 +1258,20 @@ @Override public Explosion explode(@Nullable Entity entity, @Nullable DamageSource damagesource, @Nullable ExplosionDamageCalculator explosiondamagecalculator, double d0, double d1, double d2, float f, boolean flag, Explosion.Effect explosion_effect) { + // CraftBukkit start + Explosion explosion = super.explode(entity, damagesource, explosiondamagecalculator, d0, d1, d2, f, flag, explosion_effect); + + if (explosion.wasCanceled) { + return explosion; + } + + /* Remove Explosion explosion = new Explosion(this, entity, damagesource, explosiondamagecalculator, d0, d1, d2, f, flag, explosion_effect); explosion.explode(); explosion.finalizeExplosion(false); + */ + // CraftBukkit end - TODO: Check if explosions are still properly implemented if (explosion_effect == Explosion.Effect.NONE) { explosion.clearToBlow(); } @@ -1144,13 +1343,20 @@ } public int sendParticles(T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6) { - PacketPlayOutWorldParticles packetplayoutworldparticles = new PacketPlayOutWorldParticles(t0, false, d0, d1, d2, (float) d3, (float) d4, (float) d5, (float) d6, i); + // CraftBukkit - visibility api support + return sendParticles(null, t0, d0, d1, d2, i, d3, d4, d5, d6, false); + } + + public int sendParticles(EntityPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) { + PacketPlayOutWorldParticles packetplayoutworldparticles = new PacketPlayOutWorldParticles(t0, force, d0, d1, d2, (float) d3, (float) d4, (float) d5, (float) d6, i); + // CraftBukkit end int j = 0; for (int k = 0; k < this.players.size(); ++k) { EntityPlayer entityplayer = (EntityPlayer) this.players.get(k); + if (sender != null && !entityplayer.getBukkitEntity().canSee(sender.getBukkitEntity())) continue; // CraftBukkit - if (this.sendParticles(entityplayer, false, d0, d1, d2, packetplayoutworldparticles)) { + if (this.sendParticles(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit ++j; } } @@ -1201,7 +1407,7 @@ @Nullable public BlockPosition findNearestMapStructure(TagKey tagkey, BlockPosition blockposition, int i, boolean flag) { - if (!this.server.getWorldData().worldGenSettings().generateStructures()) { + if (!this.serverLevelData.worldGenSettings().generateStructures()) { // CraftBukkit return null; } else { Optional> optional = this.registryAccess().registryOrThrow(IRegistry.STRUCTURE_REGISTRY).getTag(tagkey); @@ -1243,11 +1449,21 @@ @Nullable @Override public WorldMap getMapData(String s) { - return (WorldMap) this.getServer().overworld().getDataStorage().get(WorldMap::load, s); + // CraftBukkit start + return (WorldMap) this.getServer().overworld().getDataStorage().get((nbttagcompound) -> { + // We only get here when the data file exists, but is not a valid map + WorldMap newMap = WorldMap.load(nbttagcompound); + newMap.id = s; + MapInitializeEvent event = new MapInitializeEvent(newMap.mapView); + Bukkit.getServer().getPluginManager().callEvent(event); + return newMap; + }, s); + // CraftBukkit end } @Override public void setMapData(String s, WorldMap worldmap) { + worldmap.id = s; // CraftBukkit this.getServer().overworld().getDataStorage().set(s, worldmap); } @@ -1545,6 +1761,11 @@ @Override public void blockUpdated(BlockPosition blockposition, Block block) { if (!this.isDebug()) { + // CraftBukkit start + if (populating) { + return; + } + // CraftBukkit end this.updateNeighborsAt(blockposition, block); } @@ -1564,12 +1785,12 @@ } public boolean isFlat() { - return this.server.getWorldData().worldGenSettings().isFlatWorld(); + return this.serverLevelData.worldGenSettings().isFlatWorld(); // CraftBukkit } @Override public long getSeed() { - return this.server.getWorldData().worldGenSettings().seed(); + return this.serverLevelData.worldGenSettings().seed(); // CraftBukkit } @Nullable @@ -1592,7 +1813,7 @@ private static String getTypeCount(Iterable iterable, Function function) { try { Object2IntOpenHashMap object2intopenhashmap = new Object2IntOpenHashMap(); - Iterator iterator = iterable.iterator(); + Iterator iterator = iterable.iterator(); // CraftBukkit - decompile error while (iterator.hasNext()) { T t0 = iterator.next(); @@ -1601,7 +1822,7 @@ object2intopenhashmap.addTo(s, 1); } - return (String) object2intopenhashmap.object2IntEntrySet().stream().sorted(Comparator.comparing(Entry::getIntValue).reversed()).limit(5L).map((entry) -> { + return (String) object2intopenhashmap.object2IntEntrySet().stream().sorted(Comparator.comparing(Entry::getIntValue).reversed()).limit(5L).map((entry) -> { // CraftBukkit - decompile error String s1 = (String) entry.getKey(); return s1 + ":" + entry.getIntValue(); @@ -1612,17 +1833,33 @@ } public static void makeObsidianPlatform(WorldServer worldserver) { + // CraftBukkit start + WorldServer.makeObsidianPlatform(worldserver, null); + } + + public static void makeObsidianPlatform(WorldServer worldserver, Entity entity) { + // CraftBukkit end BlockPosition blockposition = WorldServer.END_SPAWN_POINT; int i = blockposition.getX(); int j = blockposition.getY() - 2; int k = blockposition.getZ(); + // CraftBukkit start + org.bukkit.craftbukkit.util.BlockStateListPopulator blockList = new org.bukkit.craftbukkit.util.BlockStateListPopulator(worldserver); BlockPosition.betweenClosed(i - 2, j + 1, k - 2, i + 2, j + 3, k + 2).forEach((blockposition1) -> { - worldserver.setBlockAndUpdate(blockposition1, Blocks.AIR.defaultBlockState()); + blockList.setBlock(blockposition1, Blocks.AIR.defaultBlockState(), 3); }); BlockPosition.betweenClosed(i - 2, j, k - 2, i + 2, j, k + 2).forEach((blockposition1) -> { - worldserver.setBlockAndUpdate(blockposition1, Blocks.OBSIDIAN.defaultBlockState()); + blockList.setBlock(blockposition1, Blocks.OBSIDIAN.defaultBlockState(), 3); }); + org.bukkit.World bworld = worldserver.getWorld(); + org.bukkit.event.world.PortalCreateEvent portalEvent = new org.bukkit.event.world.PortalCreateEvent((List) (List) blockList.getList(), bworld, (entity == null) ? null : entity.getBukkitEntity(), org.bukkit.event.world.PortalCreateEvent.CreateReason.END_PLATFORM); + + worldserver.getCraftServer().getPluginManager().callEvent(portalEvent); + if (!portalEvent.isCancelled()) { + blockList.updateList(); + } + // CraftBukkit end } @Override @@ -1733,6 +1970,7 @@ } entity.updateDynamicGameEventListener(DynamicGameEventListener::add); + entity.valid = true; // CraftBukkit } public void onTrackingEnd(Entity entity) { @@ -1769,6 +2007,14 @@ } entity.updateDynamicGameEventListener(DynamicGameEventListener::remove); + // CraftBukkit start + entity.valid = false; + if (!(entity instanceof EntityPlayer)) { + for (EntityPlayer player : players) { + player.getBukkitEntity().onEntityRemove(entity); + } + } + // CraftBukkit end } public void onSectionChange(Entity entity) {