From 5198c2f583b13d442550f3940a6c7a9d0b9c58f4 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Jan 2025 10:24:05 -0800 Subject: [PATCH] Update Paper --- folia-server/build.gradle.kts.patch | 27 +++--- .../ServerGamePacketListenerImpl.java.patch | 2 +- .../entity/projectile/Projectile.java.patch | 2 +- .../GlobalConfiguration.java.patch | 2 +- .../bukkit/craftbukkit/CraftServer.java.patch | 14 +-- .../bukkit/craftbukkit/CraftWorld.java.patch | 88 +++++++++---------- .../craftbukkit/entity/CraftCat.java.patch | 2 +- .../craftbukkit/entity/CraftFrog.java.patch | 2 +- .../entity/CraftHumanEntity.java.patch | 2 +- .../entity/CraftVillager.java.patch | 2 +- .../craftbukkit/entity/CraftWolf.java.patch | 2 +- .../event/CraftEventFactory.java.patch | 2 +- .../util/CraftMagicNumbers.java.patch | 2 +- .../resources/data/.paperassetsroot.patch | 3 - gradle.properties | 2 +- 15 files changed, 76 insertions(+), 78 deletions(-) delete mode 100644 folia-server/paper-patches/files/src/main/resources/data/.paperassetsroot.patch diff --git a/folia-server/build.gradle.kts.patch b/folia-server/build.gradle.kts.patch index c4577aa56f..516c958d30 100644 --- a/folia-server/build.gradle.kts.patch +++ b/folia-server/build.gradle.kts.patch @@ -1,9 +1,10 @@ --- a/paper-server/build.gradle.kts +++ b/paper-server/build.gradle.kts -@@ -21,8 +_,19 @@ +@@ -20,6 +_,21 @@ + minecraftVersion = providers.gradleProperty("mcVersion") // macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java") // gitFilePatches = true - ++ + val fork = forks.register("folia") { + upstream.patchDir("paperServer") { + upstreamPath = "paper-server" @@ -14,14 +15,14 @@ + } + + activeFork = fork -+ - paper { -- reobfMappingsPatch = layout.projectDirectory.file("../build-data/reobf-mappings-patch.tiny") ++ ++ paper { + paperServerDir = upstreamsDirectory().map { it.dir("paper/paper-server") } - } ++ } spigot { -@@ -105,7 +_,20 @@ + buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42" +@@ -101,7 +_,20 @@ } } @@ -43,7 +44,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { extendsFrom(configurations.compileClasspath.get()) } -@@ -123,7 +_,7 @@ +@@ -119,7 +_,7 @@ } dependencies { @@ -52,22 +53,22 @@ implementation("ca.spottedleaf:concurrentutil:0.0.3") implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 -@@ -192,14 +_,14 @@ +@@ -188,14 +_,14 @@ val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim() attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", - "Implementation-Title" to "Paper", -+ "Implementation-Title" to "Folia", // Folia ++ "Implementation-Title" to "Folia", "Implementation-Version" to implementationVersion, "Implementation-Vendor" to date, - "Specification-Title" to "Paper", -+ "Specification-Title" to "Folia", // Folia ++ "Specification-Title" to "Folia", "Specification-Version" to project.version, "Specification-Vendor" to "Paper Team", - "Brand-Id" to "papermc:paper", - "Brand-Name" to "Paper", -+ "Brand-Id" to "papermc:folia", // Folia -+ "Brand-Name" to "Folia", // Folia ++ "Brand-Id" to "papermc:folia", ++ "Brand-Name" to "Folia", "Build-Number" to (build ?: ""), "Build-Time" to buildTime.toString(), "Git-Branch" to gitBranch, diff --git a/folia-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/folia-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch index 64456e643c..e863fdb5b7 100644 --- a/folia-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch +++ b/folia-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch @@ -371,7 +371,7 @@ this.player = this.server.getPlayerList().respawn(this.player, false, Entity.RemovalReason.KILLED, RespawnReason.DEATH); // CraftBukkit this.resetPosition(); if (this.server.isHardcore()) { -@@ -3413,7 +_,21 @@ +@@ -3441,7 +_,21 @@ } List list = Stream.of(lines).map(ChatFormatting::stripFormatting).collect(Collectors.toList()); // Paper end - Limit client sign length diff --git a/folia-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Projectile.java.patch b/folia-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Projectile.java.patch index bb47f364d8..5dfe79639b 100644 --- a/folia-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Projectile.java.patch +++ b/folia-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Projectile.java.patch @@ -76,7 +76,7 @@ } } -@@ -451,7 +_,7 @@ +@@ -454,7 +_,7 @@ @Override public boolean mayInteract(ServerLevel level, BlockPos pos) { Entity owner = this.getOwner(); diff --git a/folia-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch b/folia-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch index a0225437c3..a77203ab88 100644 --- a/folia-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch +++ b/folia-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -@@ -396,4 +_,17 @@ +@@ -395,4 +_,17 @@ } } } diff --git a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch index a7e2dc5c80..816cf50231 100644 --- a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch +++ b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -315,7 +_,7 @@ +@@ -316,7 +_,7 @@ public final io.papermc.paper.SparksFly spark; // Paper - spark // Paper start - Folia region threading API @@ -9,7 +9,7 @@ private final io.papermc.paper.threadedregions.scheduler.FoliaAsyncScheduler asyncScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaAsyncScheduler(); private final io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler globalRegionScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler(); -@@ -392,7 +_,7 @@ +@@ -393,7 +_,7 @@ @Override public final boolean isGlobalTickThread() { @@ -18,7 +18,7 @@ } // Paper end - Folia reagion threading API -@@ -987,6 +_,9 @@ +@@ -988,6 +_,9 @@ // NOTE: Should only be called from DedicatedServer.ah() public boolean dispatchServerCommand(CommandSender sender, ConsoleInput serverCommand) { @@ -28,7 +28,7 @@ if (sender instanceof Conversable) { Conversable conversable = (Conversable) sender; -@@ -1006,12 +_,46 @@ +@@ -1007,12 +_,46 @@ } } @@ -75,7 +75,7 @@ if (this.commandMap.dispatch(sender, commandLine)) { return true; } -@@ -1283,6 +_,7 @@ +@@ -1284,6 +_,7 @@ @Override public World createWorld(WorldCreator creator) { @@ -83,7 +83,7 @@ Preconditions.checkState(this.console.getAllLevels().iterator().hasNext(), "Cannot create additional worlds on STARTUP"); //Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot create a world while worlds are being ticked"); // Paper - Cat - Temp disable. We'll see how this goes. Preconditions.checkArgument(creator != null, "WorldCreator cannot be null"); -@@ -1480,6 +_,7 @@ +@@ -1481,6 +_,7 @@ @Override public boolean unloadWorld(World world, boolean save) { @@ -91,7 +91,7 @@ //Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot unload a world while worlds are being ticked"); // Paper - Cat - Temp disable. We'll see how this goes. if (world == null) { return false; -@@ -3252,7 +_,7 @@ +@@ -3258,7 +_,7 @@ @Override public int getCurrentTick() { diff --git a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch index ade03a51ee..e76ba25815 100644 --- a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch +++ b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -228,7 +_,7 @@ +@@ -230,7 +_,7 @@ @Override public int getTickableTileEntityCount() { @@ -9,7 +9,7 @@ } @Override -@@ -295,7 +_,7 @@ +@@ -297,7 +_,7 @@ // Paper start - per world spawn limits for (SpawnCategory spawnCategory : SpawnCategory.values()) { if (CraftSpawnCategory.isValidForLimits(spawnCategory)) { @@ -18,7 +18,7 @@ } } // Paper end - per world spawn limits -@@ -365,6 +_,7 @@ +@@ -367,6 +_,7 @@ @Override public Chunk getChunkAt(int x, int z) { @@ -26,7 +26,7 @@ warnUnsafeChunk("getting a faraway chunk", x, z); // Paper net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk) this.world.getChunk(x, z, ChunkStatus.FULL, true); return new CraftChunk(chunk); -@@ -395,10 +_,10 @@ +@@ -397,10 +_,10 @@ @Override public boolean isChunkGenerated(int x, int z) { // Paper start - Fix this method @@ -39,7 +39,7 @@ } ChunkAccess chunk = world.getChunkSource().getChunkAtImmediately(x, z); if (chunk != null) { -@@ -455,7 +_,7 @@ +@@ -457,7 +_,7 @@ } private boolean unloadChunk0(int x, int z, boolean save) { @@ -48,7 +48,7 @@ if (!this.isChunkLoaded(x, z)) { return true; } -@@ -472,7 +_,7 @@ +@@ -474,7 +_,7 @@ @Override public boolean regenerateChunk(int x, int z) { @@ -57,7 +57,7 @@ throw new UnsupportedOperationException("Not supported in this Minecraft version! Unless you can fix it, this is not a bug :)"); /* if (!unloadChunk0(x, z, false)) { -@@ -499,6 +_,7 @@ +@@ -501,6 +_,7 @@ @Override public boolean refreshChunk(int x, int z) { @@ -65,7 +65,7 @@ ChunkHolder playerChunk = this.world.getChunkSource().chunkMap.getVisibleChunkIfPresent(ChunkPos.asLong(x, z)); if (playerChunk == null) return false; -@@ -549,7 +_,7 @@ +@@ -551,7 +_,7 @@ @Override public boolean loadChunk(int x, int z, boolean generate) { @@ -74,7 +74,7 @@ warnUnsafeChunk("loading a faraway chunk", x, z); // Paper ChunkAccess chunk = this.world.getChunkSource().getChunk(x, z, generate || isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // Paper -@@ -589,7 +_,7 @@ +@@ -591,7 +_,7 @@ final DistanceManager distanceManager = this.world.getChunkSource().chunkMap.distanceManager; if (distanceManager.addPluginRegionTicket(new ChunkPos(x, z), plugin)) { @@ -83,7 +83,7 @@ return true; } -@@ -777,13 +_,15 @@ +@@ -779,13 +_,15 @@ @Override public boolean generateTree(Location loc, TreeType type, BlockChangeDelegate delegate) { @@ -104,7 +104,7 @@ BlockPos position = ((CraftBlockState) blockstate).getPosition(); net.minecraft.world.level.block.state.BlockState oldBlock = this.world.getBlockState(position); int flag = ((CraftBlockState) blockstate).getFlag(); -@@ -791,10 +_,10 @@ +@@ -793,10 +_,10 @@ net.minecraft.world.level.block.state.BlockState newBlock = this.world.getBlockState(position); this.world.notifyAndUpdatePhysics(position, null, oldBlock, newBlock, newBlock, flag, 512); } @@ -117,7 +117,7 @@ return false; } } -@@ -828,6 +_,7 @@ +@@ -830,6 +_,7 @@ @Override public void setTime(long time) { @@ -125,7 +125,7 @@ long margin = (time - this.getFullTime()) % 24000; if (margin < 0) margin += 24000; this.setFullTime(this.getFullTime() + margin); -@@ -840,6 +_,7 @@ +@@ -842,6 +_,7 @@ @Override public void setFullTime(long time) { @@ -133,7 +133,7 @@ // Notify anyone who's listening TimeSkipEvent event = new TimeSkipEvent(this, TimeSkipEvent.SkipReason.CUSTOM, time - this.world.getDayTime()); this.server.getPluginManager().callEvent(event); -@@ -867,7 +_,7 @@ +@@ -869,7 +_,7 @@ @Override public long getGameTime() { @@ -142,7 +142,7 @@ } @Override -@@ -892,6 +_,7 @@ +@@ -894,6 +_,7 @@ } public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, Entity source, Consumer configurator) { // Paper end - expand explosion API @@ -150,7 +150,7 @@ net.minecraft.world.level.Level.ExplosionInteraction explosionType; if (!breakBlocks) { explosionType = net.minecraft.world.level.Level.ExplosionInteraction.NONE; // Don't break blocks -@@ -901,6 +_,7 @@ +@@ -903,6 +_,7 @@ explosionType = net.minecraft.world.level.Level.ExplosionInteraction.MOB; // Respect mobGriefing gamerule } @@ -158,7 +158,7 @@ net.minecraft.world.entity.Entity entity = (source == null) ? null : ((CraftEntity) source).getHandle(); return !this.world.explode0(entity, Explosion.getDefaultDamageSource(this.world, entity), null, x, y, z, power, setFire, explosionType, ParticleTypes.EXPLOSION, ParticleTypes.EXPLOSION_EMITTER, SoundEvents.GENERIC_EXPLODE, configurator).wasCanceled; // Paper - expand explosion API } -@@ -983,6 +_,7 @@ +@@ -985,6 +_,7 @@ @Override public int getHighestBlockYAt(int x, int z, org.bukkit.HeightMap heightMap) { @@ -166,7 +166,7 @@ warnUnsafeChunk("getting a faraway chunk", x >> 4, z >> 4); // Paper // Transient load for this tick return this.world.getChunk(x >> 4, z >> 4).getHeight(CraftHeightMap.toNMS(heightMap), x, z); -@@ -1013,6 +_,7 @@ +@@ -1015,6 +_,7 @@ @Override public void setBiome(int x, int y, int z, Holder bb) { BlockPos pos = new BlockPos(x, 0, z); @@ -174,7 +174,7 @@ if (this.world.hasChunkAt(pos)) { net.minecraft.world.level.chunk.LevelChunk chunk = this.world.getChunkAt(pos); -@@ -1323,6 +_,7 @@ +@@ -1325,6 +_,7 @@ @Override public void setStorm(boolean hasStorm) { @@ -182,7 +182,7 @@ this.world.serverLevelData.setRaining(hasStorm, org.bukkit.event.weather.WeatherChangeEvent.Cause.PLUGIN); // Paper - Add cause to Weather/ThunderChangeEvents this.setWeatherDuration(0); // Reset weather duration (legacy behaviour) this.setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands) -@@ -1335,6 +_,7 @@ +@@ -1337,6 +_,7 @@ @Override public void setWeatherDuration(int duration) { @@ -190,7 +190,7 @@ this.world.serverLevelData.setRainTime(duration); } -@@ -1345,6 +_,7 @@ +@@ -1347,6 +_,7 @@ @Override public void setThundering(boolean thundering) { @@ -198,7 +198,7 @@ this.world.serverLevelData.setThundering(thundering, org.bukkit.event.weather.ThunderChangeEvent.Cause.PLUGIN); // Paper - Add cause to Weather/ThunderChangeEvents this.setThunderDuration(0); // Reset weather duration (legacy behaviour) this.setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands) -@@ -1357,6 +_,7 @@ +@@ -1359,6 +_,7 @@ @Override public void setThunderDuration(int duration) { @@ -206,7 +206,7 @@ this.world.serverLevelData.setThunderTime(duration); } -@@ -1367,6 +_,7 @@ +@@ -1369,6 +_,7 @@ @Override public void setClearWeatherDuration(int duration) { @@ -214,7 +214,7 @@ this.world.serverLevelData.setClearWeatherTime(duration); } -@@ -1565,6 +_,7 @@ +@@ -1567,6 +_,7 @@ @Override public void setKeepSpawnInMemory(boolean keepLoaded) { @@ -222,7 +222,7 @@ if (keepLoaded) { this.setGameRule(GameRule.SPAWN_CHUNK_RADIUS, this.getGameRuleDefault(GameRule.SPAWN_CHUNK_RADIUS)); } else { -@@ -1633,6 +_,7 @@ +@@ -1635,6 +_,7 @@ @Override public void setHardcore(boolean hardcore) { @@ -230,7 +230,7 @@ this.world.serverLevelData.settings.hardcore = hardcore; } -@@ -1645,6 +_,7 @@ +@@ -1647,6 +_,7 @@ @Override @Deprecated public void setTicksPerAnimalSpawns(int ticksPerAnimalSpawns) { @@ -238,7 +238,7 @@ this.setTicksPerSpawns(SpawnCategory.ANIMAL, ticksPerAnimalSpawns); } -@@ -1657,6 +_,7 @@ +@@ -1659,6 +_,7 @@ @Override @Deprecated public void setTicksPerMonsterSpawns(int ticksPerMonsterSpawns) { @@ -246,7 +246,7 @@ this.setTicksPerSpawns(SpawnCategory.MONSTER, ticksPerMonsterSpawns); } -@@ -1669,6 +_,7 @@ +@@ -1671,6 +_,7 @@ @Override @Deprecated public void setTicksPerWaterSpawns(int ticksPerWaterSpawns) { @@ -254,7 +254,7 @@ this.setTicksPerSpawns(SpawnCategory.WATER_ANIMAL, ticksPerWaterSpawns); } -@@ -1681,6 +_,7 @@ +@@ -1683,6 +_,7 @@ @Override @Deprecated public void setTicksPerWaterAmbientSpawns(int ticksPerWaterAmbientSpawns) { @@ -262,7 +262,7 @@ this.setTicksPerSpawns(SpawnCategory.WATER_AMBIENT, ticksPerWaterAmbientSpawns); } -@@ -1693,6 +_,7 @@ +@@ -1695,6 +_,7 @@ @Override @Deprecated public void setTicksPerWaterUndergroundCreatureSpawns(int ticksPerWaterUndergroundCreatureSpawns) { @@ -270,7 +270,7 @@ this.setTicksPerSpawns(SpawnCategory.WATER_UNDERGROUND_CREATURE, ticksPerWaterUndergroundCreatureSpawns); } -@@ -1705,11 +_,13 @@ +@@ -1707,11 +_,13 @@ @Override @Deprecated public void setTicksPerAmbientSpawns(int ticksPerAmbientSpawns) { @@ -284,7 +284,7 @@ Preconditions.checkArgument(spawnCategory != null, "SpawnCategory cannot be null"); Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory.%s are not supported", spawnCategory); -@@ -1726,21 +_,25 @@ +@@ -1728,21 +_,25 @@ @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { @@ -310,7 +310,7 @@ this.server.getWorldMetadata().removeMetadata(this, metadataKey, owningPlugin); } -@@ -1753,6 +_,7 @@ +@@ -1755,6 +_,7 @@ @Override @Deprecated public void setMonsterSpawnLimit(int limit) { @@ -318,7 +318,7 @@ this.setSpawnLimit(SpawnCategory.MONSTER, limit); } -@@ -1765,6 +_,7 @@ +@@ -1767,6 +_,7 @@ @Override @Deprecated public void setAnimalSpawnLimit(int limit) { @@ -326,7 +326,7 @@ this.setSpawnLimit(SpawnCategory.ANIMAL, limit); } -@@ -1777,6 +_,7 @@ +@@ -1779,6 +_,7 @@ @Override @Deprecated public void setWaterAnimalSpawnLimit(int limit) { @@ -334,7 +334,7 @@ this.setSpawnLimit(SpawnCategory.WATER_ANIMAL, limit); } -@@ -1789,6 +_,7 @@ +@@ -1791,6 +_,7 @@ @Override @Deprecated public void setWaterAmbientSpawnLimit(int limit) { @@ -342,7 +342,7 @@ this.setSpawnLimit(SpawnCategory.WATER_AMBIENT, limit); } -@@ -1801,6 +_,7 @@ +@@ -1803,6 +_,7 @@ @Override @Deprecated public void setWaterUndergroundCreatureSpawnLimit(int limit) { @@ -350,7 +350,7 @@ this.setSpawnLimit(SpawnCategory.WATER_UNDERGROUND_CREATURE, limit); } -@@ -1813,6 +_,7 @@ +@@ -1815,6 +_,7 @@ @Override @Deprecated public void setAmbientSpawnLimit(int limit) { @@ -358,7 +358,7 @@ this.setSpawnLimit(SpawnCategory.AMBIENT, limit); } -@@ -1835,6 +_,7 @@ +@@ -1837,6 +_,7 @@ @Override public void setSpawnLimit(SpawnCategory spawnCategory, int limit) { @@ -366,7 +366,7 @@ Preconditions.checkArgument(spawnCategory != null, "SpawnCategory cannot be null"); Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory.%s are not supported", spawnCategory); -@@ -1917,7 +_,7 @@ +@@ -1919,7 +_,7 @@ if (!(entity instanceof CraftEntity craftEntity) || entity.getWorld() != this || sound == null || category == null) return; ClientboundSoundEntityPacket packet = new ClientboundSoundEntityPacket(CraftSound.bukkitToMinecraftHolder(sound), net.minecraft.sounds.SoundSource.valueOf(category.name()), craftEntity.getHandle(), volume, pitch, seed); @@ -375,7 +375,7 @@ if (entityTracker != null) { entityTracker.broadcastAndSend(packet); } -@@ -1938,7 +_,7 @@ +@@ -1940,7 +_,7 @@ if (!(entity instanceof CraftEntity craftEntity) || entity.getWorld() != this || sound == null || category == null) return; ClientboundSoundEntityPacket packet = new ClientboundSoundEntityPacket(Holder.direct(SoundEvent.createVariableRangeEvent(ResourceLocation.parse(sound))), net.minecraft.sounds.SoundSource.valueOf(category.name()), craftEntity.getHandle(), volume, pitch, seed); @@ -384,7 +384,7 @@ if (entityTracker != null) { entityTracker.broadcastAndSend(packet); } -@@ -2021,6 +_,7 @@ +@@ -2023,6 +_,7 @@ @Override public boolean setGameRuleValue(String rule, String value) { @@ -392,7 +392,7 @@ // No null values allowed if (rule == null || value == null) return false; -@@ -2063,6 +_,7 @@ +@@ -2065,6 +_,7 @@ @Override public boolean setGameRule(GameRule rule, T newValue) { @@ -400,7 +400,7 @@ Preconditions.checkArgument(rule != null, "GameRule cannot be null"); Preconditions.checkArgument(newValue != null, "GameRule value cannot be null"); -@@ -2290,6 +_,12 @@ +@@ -2292,6 +_,12 @@ @Override public void sendGameEvent(Entity sourceEntity, org.bukkit.GameEvent gameEvent, Vector position) { diff --git a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java.patch b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java.patch index 472064c399..5531c2dd8b 100644 --- a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java.patch +++ b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java -@@ -19,8 +_,16 @@ +@@ -18,8 +_,16 @@ super(server, entity); } diff --git a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftFrog.java.patch b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftFrog.java.patch index edffcf7cf3..06dcb78fc8 100644 --- a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftFrog.java.patch +++ b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftFrog.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFrog.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFrog.java -@@ -19,8 +_,16 @@ +@@ -18,8 +_,16 @@ super(server, entity); } diff --git a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch index 542406af67..1aa112a850 100644 --- a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch +++ b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -@@ -303,8 +_,16 @@ +@@ -306,8 +_,16 @@ this.mode = mode; } diff --git a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch index 5cfafd18e7..ff3632e4fb 100644 --- a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch +++ b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java -@@ -34,8 +_,16 @@ +@@ -32,8 +_,16 @@ super(server, entity); } diff --git a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch index b816304424..ceba85b652 100644 --- a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch +++ b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java -@@ -31,8 +_,16 @@ +@@ -30,8 +_,16 @@ } } diff --git a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java.patch b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java.patch index 76e63dc1ca..9ad1090949 100644 --- a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java.patch +++ b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java.patch @@ -18,7 +18,7 @@ Bukkit.getPluginManager().callEvent(event); if (!event.isCancelled()) { -@@ -2229,7 +_,7 @@ +@@ -2230,7 +_,7 @@ CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemStack.copyWithCount(1)); org.bukkit.event.block.BlockDispenseEvent event = new org.bukkit.event.block.BlockDispenseEvent(bukkitBlock, craftItem.clone(), CraftVector.toBukkit(to)); diff --git a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch index c66d0fccd1..5b109a2d02 100644 --- a/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch +++ b/folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -384,6 +_,12 @@ +@@ -379,6 +_,12 @@ throw new InvalidPluginException("Unsupported API version " + pdf.getAPIVersion()); } diff --git a/folia-server/paper-patches/files/src/main/resources/data/.paperassetsroot.patch b/folia-server/paper-patches/files/src/main/resources/data/.paperassetsroot.patch deleted file mode 100644 index b41d58b686..0000000000 --- a/folia-server/paper-patches/files/src/main/resources/data/.paperassetsroot.patch +++ /dev/null @@ -1,3 +0,0 @@ ---- a/src/main/resources/data/.paperassetsroot -+++ b/src/main/resources/data/.paperassetsroot -@@ -1,0 +_,0 @@ diff --git a/gradle.properties b/gradle.properties index b1d990d65a..b72ad06c7c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=dev.folia version=1.21.4-R0.1-SNAPSHOT mcVersion=1.21.4 -paperRef=3ad3fbc19ad6a85a7a992f907e3e5f98cad85b68 +paperRef=8e80d4e15852ffbed1a18d1e9b34550191433200 org.gradle.configuration-cache=true org.gradle.caching=true