Update to Minecraft 1.21.2

By: md_5 <git@md-5.net>
2024-10-23 02:15:00 +11:00
parent 2c4beb962b
commit d3a23f42c3
522 changed files with 8501 additions and 6477 deletions
--- a/paper-server/nms-patches/net/minecraft/server/level/WorldServer.patch
+++ b/paper-server/nms-patches/net/minecraft/server/level/WorldServer.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/WorldServer.java
 +++ b/net/minecraft/server/level/WorldServer.java
-@@ -171,6 +171,23 @@
+@@ -173,6 +173,23 @@
 import net.minecraft.world.ticks.TickListServer;
 import org.slf4j.Logger;
 
@@ -21,31 +21,28 @@
 +import org.bukkit.event.world.TimeSkipEvent;
 +// CraftBukkit end
 +
- public class WorldServer extends World implements GeneratorAccessSeed {
+ public class WorldServer extends World implements ServerEntityGetter, GeneratorAccessSeed {
 
     public static final BlockPosition END_SPAWN_POINT = new BlockPosition(100, 50, 0);
-@@ -184,7 +201,7 @@
-     final List<EntityPlayer> players;
+@@ -186,7 +203,7 @@
+     final List<EntityPlayer> players = Lists.newArrayList();
     private final ChunkProviderServer chunkSource;
     private final MinecraftServer server;
 -    public final IWorldDataServer serverLevelData;
 +    public final WorldDataServer serverLevelData; // CraftBukkit - type
     private int lastSpawnChunkRadius;
-     final EntityTickList entityTickList;
+     final EntityTickList entityTickList = new EntityTickList();
     public final PersistentEntitySectionManager<Entity> entityManager;
-@@ -211,12 +228,30 @@
+@@ -213,13 +230,47 @@
     private final boolean tickTime;
     private final RandomSequences randomSequences;
 
 -    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, @Nullable RandomSequences randomsequences) {
-        IRegistryCustom.Dimension iregistrycustom_dimension = minecraftserver.registryAccess();
-        Holder holder = worlddimension.type();
+-        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), false, flag, i, minecraftserver.getMaxChainedNeighborUpdates());
 +    // CraftBukkit start
 +    public final Convertable.ConversionSession convertable;
 +    public final UUID uuid;
- 
-        Objects.requireNonNull(minecraftserver);
-        super(iworlddataserver, resourcekey, iregistrycustom_dimension, holder, minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates());
+
 +    public Chunk getChunkIfLoaded(int x, int z) {
 +        return this.chunkSource.getChunk(x, z, false);
 +    }
@@ -57,19 +54,13 @@
 +
 +    // 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, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
-+        // IRegistryCustom.Dimension iregistrycustom_dimension = minecraftserver.registryAccess(); // CraftBukkit - decompile error
-+        // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
-+
-+        // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
-+        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env);
+        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), 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());
-@@ -231,6 +266,22 @@
+         this.tickTime = flag1;
+         this.server = minecraftserver;
         this.customSpawners = list;
         this.serverLevelData = iworlddataserver;
         ChunkGenerator chunkgenerator = worlddimension.generator();
@@ -77,7 +68,7 @@
 +        serverLevelData.setWorld(this);
 +
 +        if (biomeProvider != null) {
-+            WorldChunkManager worldChunkManager = new CustomWorldChunkManager(getWorld(), biomeProvider, server.registryAccess().registryOrThrow(Registries.BIOME));
+            WorldChunkManager worldChunkManager = new CustomWorldChunkManager(getWorld(), biomeProvider, server.registryAccess().lookupOrThrow(Registries.BIOME));
 +            if (chunkgenerator instanceof ChunkGeneratorAbstract cga) {
 +                chunkgenerator = new ChunkGeneratorAbstract(worldChunkManager, cga.settings);
 +            } else if (chunkgenerator instanceof ChunkProviderFlat cpf) {
@@ -92,7 +83,7 @@
         boolean flag2 = minecraftserver.forceSynchronousWrites();
         DataFixer datafixer = minecraftserver.getFixerUpper();
         EntityPersistentStorage<Entity> entitypersistentstorage = new EntityStorage(new SimpleRegionStorage(new RegionStorageInfo(convertable_conversionsession.getLevelId(), resourcekey, "entities"), convertable_conversionsession.getDimensionPath(resourcekey).resolve("entities"), datafixer, flag2, DataFixTypes.ENTITY_CHUNK), this, minecraftserver);
-@@ -258,9 +309,9 @@
+@@ -247,9 +298,9 @@
         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);
@@ -105,7 +96,7 @@
         } else {
             this.dragonFight = null;
         }
-@@ -270,6 +321,7 @@
+@@ -259,6 +310,7 @@
         this.randomSequences = (RandomSequences) Objects.requireNonNullElseGet(randomsequences, () -> {
             return (RandomSequences) this.getDataStorage().computeIfAbsent(RandomSequences.factory(l), "random_sequences");
         });
@@ -113,7 +104,7 @@
     }
 
     /** @deprecated */
-@@ -314,12 +366,20 @@
+@@ -304,12 +356,20 @@
         long j;
 
         if (this.sleepStatus.areEnoughSleeping(i) && this.sleepStatus.areEnoughDeepSleeping(i, this.players)) {
@@ -137,7 +128,7 @@
             if (this.getGameRules().getBoolean(GameRules.RULE_WEATHER_CYCLE) && this.isRaining()) {
                 this.resetWeatherCycle();
             }
-@@ -354,7 +414,7 @@
+@@ -344,7 +404,7 @@
 
         this.handlingTick = false;
         gameprofilerfiller.pop();
@@ -146,16 +137,7 @@
 
         if (flag1) {
             this.resetEmptyTime();
-@@ -370,7 +430,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 if (!tickratemanager.isEntityFrozen(entity)) {
-                         gameprofilerfiller.push("checkDespawn");
-@@ -442,7 +502,7 @@
+@@ -428,7 +488,7 @@
 
     private void wakeUpAllPlayers() {
         this.sleepStatus.removeAllSleepers();
@@ -164,7 +146,7 @@
             entityplayer.stopSleepInBed(false, false);
         });
     }
-@@ -469,7 +529,7 @@
+@@ -455,7 +515,7 @@
                         entityhorseskeleton.setTrap(true);
                         entityhorseskeleton.setAge(0);
                         entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
@@ -173,7 +155,7 @@
                     }
                 }
 
-@@ -478,7 +538,7 @@
+@@ -464,7 +524,7 @@
                 if (entitylightning != null) {
                     entitylightning.moveTo(Vec3D.atBottomCenterOf(blockposition));
                     entitylightning.setVisualOnly(flag1);
@@ -182,7 +164,7 @@
                 }
             }
         }
-@@ -534,7 +594,7 @@
+@@ -520,7 +580,7 @@
         BiomeBase biomebase = (BiomeBase) this.getBiome(blockposition1).value();
 
         if (biomebase.shouldFreeze(this, blockposition2)) {
@@ -191,7 +173,7 @@
         }
 
         if (this.isRaining()) {
-@@ -550,10 +610,10 @@
+@@ -536,10 +596,10 @@
                         IBlockData iblockdata1 = (IBlockData) iblockdata.setValue(BlockSnow.LAYERS, j + 1);
 
                         Block.pushEntitiesUp(iblockdata, iblockdata1, this, blockposition1);
@@ -204,7 +186,7 @@
                 }
             }
 
-@@ -714,6 +774,7 @@
+@@ -700,6 +760,7 @@
             this.rainLevel = MathHelper.clamp(this.rainLevel, 0.0F, 1.0F);
         }
 
@@ -212,7 +194,7 @@
         if (this.oRainLevel != this.rainLevel) {
             this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel), this.dimension());
         }
-@@ -732,15 +793,48 @@
+@@ -718,15 +779,48 @@
             this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel));
             this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.THUNDER_LEVEL_CHANGE, this.thunderLevel));
         }
@@ -263,15 +245,15 @@
     }
 
     public void resetEmptyTime() {
-@@ -775,6 +869,7 @@
+@@ -762,6 +856,7 @@
         });
         gameprofilerfiller.incrementCounter("tickNonPassenger");
         entity.tick();
 +        entity.postTick(); // CraftBukkit
-         this.getProfiler().pop();
+         gameprofilerfiller.pop();
         Iterator iterator = entity.getPassengers().iterator();
 
-@@ -798,6 +893,7 @@
+@@ -785,6 +880,7 @@
                 });
                 gameprofilerfiller.incrementCounter("tickPassenger");
                 entity1.rideTick();
@@ -279,7 +261,7 @@
                 gameprofilerfiller.pop();
                 Iterator iterator = entity1.getPassengers().iterator();
 
-@@ -822,6 +918,7 @@
+@@ -809,6 +905,7 @@
         ChunkProviderServer chunkproviderserver = this.getChunkSource();
 
         if (!flag1) {
@@ -287,7 +269,7 @@
             if (iprogressupdate != null) {
                 iprogressupdate.progressStartNoAbort(IChatBaseComponent.translatable("menu.savingLevel"));
             }
-@@ -839,11 +936,19 @@
+@@ -826,11 +923,19 @@
             }
 
         }
@@ -301,14 +283,14 @@
 +        // CraftBukkit end
     }
 
-     private void saveLevelData() {
+     private void saveLevelData(boolean flag) {
         if (this.dragonFight != null) {
 -            this.server.getWorldData().setEndDragonFightData(this.dragonFight.saveData());
 +            this.serverLevelData.setEndDragonFightData(this.dragonFight.saveData()); // CraftBukkit
         }
 
-         this.getChunkSource().getDataStorage().save();
-@@ -908,18 +1013,40 @@
+         WorldPersistentData worldpersistentdata = this.getChunkSource().getDataStorage();
+@@ -902,18 +1007,40 @@
 
     @Override
     public boolean addFreshEntity(Entity entity) {
@@ -352,7 +334,7 @@
         }
 
     }
-@@ -944,24 +1071,37 @@
+@@ -938,24 +1065,37 @@
         this.entityManager.addNewEntity(entityplayer);
     }
 
@@ -394,19 +376,19 @@
             return true;
         }
     }
-@@ -972,13 +1112,35 @@
+@@ -966,13 +1106,35 @@
     }
 
     public void removePlayerImmediately(EntityPlayer entityplayer, Entity.RemovalReason entity_removalreason) {
 -        entityplayer.remove(entity_removalreason);
 +        entityplayer.remove(entity_removalreason, null); // CraftBukkit - add Bukkit remove cause
-     }
- 
+    }
+
 +    // 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);
 +
@@ -431,7 +413,7 @@
         while (iterator.hasNext()) {
             EntityPlayer entityplayer = (EntityPlayer) iterator.next();
 
-@@ -987,6 +1149,12 @@
+@@ -981,6 +1143,12 @@
                 double d1 = (double) blockposition.getY() - entityplayer.getY();
                 double d2 = (double) blockposition.getZ() - entityplayer.getZ();
 
@@ -444,7 +426,7 @@
                 if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {
                     entityplayer.connection.send(new PacketPlayOutBlockBreakAnimation(i, blockposition, j));
                 }
-@@ -1047,7 +1215,18 @@
+@@ -1059,7 +1227,18 @@
             Iterator iterator = this.navigatingMobs.iterator();
 
             while (iterator.hasNext()) {
@@ -464,19 +446,52 @@
                 NavigationAbstract navigationabstract = entityinsentient.getNavigation();
 
                 if (navigationabstract.shouldRecomputePath(blockposition)) {
-@@ -1109,6 +1288,11 @@
+@@ -1125,6 +1304,12 @@
+ 
     @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, ParticleParam particleparam, ParticleParam particleparam1, Holder<SoundEffect> holder) {
-         Explosion explosion = this.explode(entity, damagesource, explosiondamagecalculator, d0, d1, d2, f, flag, world_a, false, particleparam, particleparam1, holder);
+     public void explode(@Nullable Entity entity, @Nullable DamageSource damagesource, @Nullable ExplosionDamageCalculator explosiondamagecalculator, double d0, double d1, double d2, float f, boolean flag, World.a world_a, ParticleParam particleparam, ParticleParam particleparam1, Holder<SoundEffect> holder) {
 +        // CraftBukkit start
-+        if (explosion.wasCanceled) {
-+            return explosion;
+        this.explode0(entity, damagesource, explosiondamagecalculator, d0, d1, d2, f, flag, world_a, particleparam, particleparam1, holder);
+    }
+
+    public ServerExplosion explode0(@Nullable Entity entity, @Nullable DamageSource damagesource, @Nullable ExplosionDamageCalculator explosiondamagecalculator, double d0, double d1, double d2, float f, boolean flag, World.a world_a, ParticleParam particleparam, ParticleParam particleparam1, Holder<SoundEffect> holder) {
+        // CraftBukkit end
+         Explosion.Effect explosion_effect;
+ 
+         switch (world_a) {
+@@ -1143,6 +1328,11 @@
+             case TRIGGER:
+                 explosion_effect = Explosion.Effect.TRIGGER_BLOCK;
+                 break;
+            // CraftBukkit start - handle custom explosion type
+            case STANDARD:
+                explosion_effect = Explosion.Effect.DESTROY;
+                break;
+            // CraftBukkit end
+             default:
+                 throw new MatchException((String) null, (Throwable) null);
+         }
+@@ -1152,6 +1342,11 @@
+         ServerExplosion serverexplosion = new ServerExplosion(this, entity, damagesource, explosiondamagecalculator, vec3d, f, flag, explosion_effect1);
+ 
+         serverexplosion.explode();
+        // CraftBukkit start
+        if (serverexplosion.wasCanceled) {
+            return serverexplosion;
 +        }
 +        // CraftBukkit end
+         ParticleParam particleparam2 = serverexplosion.isSmall() ? particleparam : particleparam1;
+         Iterator iterator = this.players.iterator();
 
-         if (!explosion.interactsWithBlocks()) {
-             explosion.clearToBlow();
-@@ -1181,13 +1365,20 @@
+@@ -1165,6 +1360,7 @@
+             }
+         }
+ 
+        return serverexplosion; // CraftBukkit
+     }
+ 
+     private Explosion.Effect getDestroyType(GameRules.GameRuleKey<GameRules.GameRuleBoolean> gamerules_gamerulekey) {
+@@ -1225,13 +1421,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) {
@@ -499,7 +514,7 @@
                 ++j;
             }
         }
-@@ -1238,7 +1429,7 @@
+@@ -1282,7 +1485,7 @@
 
     @Nullable
     public BlockPosition findNearestMapStructure(TagKey<Structure> tagkey, BlockPosition blockposition, int i, boolean flag) {
@@ -507,8 +522,8 @@
 +        if (!this.serverLevelData.worldGenOptions().generateStructures()) { // CraftBukkit
             return null;
         } else {
-             Optional<HolderSet.Named<Structure>> optional = this.registryAccess().registryOrThrow(Registries.STRUCTURE).getTag(tagkey);
-@@ -1280,11 +1471,22 @@
+             Optional<HolderSet.Named<Structure>> optional = this.registryAccess().lookupOrThrow(Registries.STRUCTURE).get(tagkey);
+@@ -1324,11 +1527,22 @@
     @Nullable
     @Override
     public WorldMap getMapData(MapId mapid) {
@@ -532,7 +547,7 @@
         this.getServer().overworld().getDataStorage().set(mapid.key(), worldmap);
     }
 
-@@ -1595,6 +1797,11 @@
+@@ -1639,6 +1853,11 @@
     @Override
     public void blockUpdated(BlockPosition blockposition, Block block) {
         if (!this.isDebug()) {
@@ -544,7 +559,7 @@
             this.updateNeighborsAt(blockposition, block);
         }
 
-@@ -1614,12 +1821,12 @@
+@@ -1658,12 +1877,12 @@
     }
 
     public boolean isFlat() {
@@ -559,7 +574,7 @@
     }
 
     @Nullable
-@@ -1642,7 +1849,7 @@
+@@ -1686,7 +1905,7 @@
     private static <T> String getTypeCount(Iterable<T> iterable, Function<T, String> function) {
         try {
             Object2IntOpenHashMap<String> object2intopenhashmap = new Object2IntOpenHashMap();
@@ -568,7 +583,7 @@
 
             while (iterator.hasNext()) {
                 T t0 = iterator.next();
-@@ -1651,7 +1858,7 @@
+@@ -1695,7 +1914,7 @@
                 object2intopenhashmap.addTo(s, 1);
             }
 
@@ -577,7 +592,7 @@
                 String s1 = (String) entry.getKey();
 
                 return s1 + ":" + entry.getIntValue();
-@@ -1796,6 +2003,8 @@
+@@ -1854,6 +2073,8 @@
             }
 
             entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
@@ -586,7 +601,7 @@
         }
 
         public void onTrackingEnd(Entity entity) {
-@@ -1827,6 +2036,14 @@
+@@ -1885,6 +2106,14 @@
             }
 
             entity.updateDynamicGameEventListener(DynamicGameEventListener::remove);