From cfd1e070a2bbfa19b3c0e5c21a6360daa5da548b Mon Sep 17 00:00:00 2001 From: granny Date: Fri, 30 May 2025 19:51:05 -0700 Subject: [PATCH] Updated Upstream (Paper) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@ca8da0e3 Commands PaperMC/Paper@e0437448 /net/minecraft/world/entity/decoration/ PaperMC/Paper@d251511d net\minecraft\worldntity\projectile\ PaperMC/Paper@62c4dda5 /net/minecraft/world/entity/monster PaperMC/Paper@4a821685 ServerPlayer, ServerLevel, ServerEntity PaperMC/Paper@6d71abd2 Other random classes PaperMC/Paper@f44197c4 net/minecraft/world/entity/item PaperMC/Paper@2f152e01 Fix some compile errors PaperMC/Paper@92ece7b6 Fix dropped diff PaperMC/Paper@8c974745 readd dropped ack diff --- gradle.properties | 2 +- .../net/minecraft/commands/CommandSourceStack.java.patch | 0 .../net/minecraft/server/Main.java.patch | 0 .../net/minecraft/server/dedicated/DedicatedServer.java.patch | 0 .../net/minecraft/server/level/ServerLevel.java.patch | 0 .../server/network/ServerCommonPacketListenerImpl.java.patch | 0 .../net/minecraft/world/entity/ExperienceOrb.java.patch | 0 .../net/minecraft/world/entity/LivingEntity.java.patch | 0 .../net/minecraft/world/entity/item/ItemEntity.java.patch | 0 .../net/minecraft/world/entity/player/Player.java.patch | 0 .../net/minecraft/world/inventory/AnvilMenu.java.patch | 0 .../net/minecraft/world/level/BaseSpawner.java.patch | 0 12 files changed, 1 insertion(+), 1 deletion(-) rename purpur-server/minecraft-patches/{unapplied-sources => sources}/net/minecraft/commands/CommandSourceStack.java.patch (100%) rename purpur-server/minecraft-patches/{unapplied-sources => sources}/net/minecraft/server/Main.java.patch (100%) rename purpur-server/minecraft-patches/{unapplied-sources => sources}/net/minecraft/server/dedicated/DedicatedServer.java.patch (100%) rename purpur-server/minecraft-patches/{unapplied-sources => sources}/net/minecraft/server/level/ServerLevel.java.patch (100%) rename purpur-server/minecraft-patches/{unapplied-sources => sources}/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch (100%) rename purpur-server/minecraft-patches/{unapplied-sources => sources}/net/minecraft/world/entity/ExperienceOrb.java.patch (100%) rename purpur-server/minecraft-patches/{unapplied-sources => sources}/net/minecraft/world/entity/LivingEntity.java.patch (100%) rename purpur-server/minecraft-patches/{unapplied-sources => sources}/net/minecraft/world/entity/item/ItemEntity.java.patch (100%) rename purpur-server/minecraft-patches/{unapplied-sources => sources}/net/minecraft/world/entity/player/Player.java.patch (100%) rename purpur-server/minecraft-patches/{unapplied-sources => sources}/net/minecraft/world/inventory/AnvilMenu.java.patch (100%) rename purpur-server/minecraft-patches/{unapplied-sources => sources}/net/minecraft/world/level/BaseSpawner.java.patch (100%) diff --git a/gradle.properties b/gradle.properties index 87538ed74..25ccc019c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21.6-R0.1-SNAPSHOT mcVersion = 1.21.6-pre1 -paperCommit = 0795cbed2563d0ba693a8eec8754cffa62b52756 +paperCommit = 8c9747458e8544bc28296025d03ec10a429c26b0 org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/commands/CommandSourceStack.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch similarity index 100% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/commands/CommandSourceStack.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/Main.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/Main.java.patch similarity index 100% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/Main.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/server/Main.java.patch diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/dedicated/DedicatedServer.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch similarity index 100% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/dedicated/DedicatedServer.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerLevel.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch similarity index 100% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerLevel.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch similarity index 100% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ExperienceOrb.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ExperienceOrb.java.patch similarity index 100% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ExperienceOrb.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ExperienceOrb.java.patch diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/LivingEntity.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch similarity index 100% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/LivingEntity.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/item/ItemEntity.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch similarity index 100% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/item/ItemEntity.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/player/Player.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch similarity index 100% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/player/Player.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/AnvilMenu.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AnvilMenu.java.patch similarity index 100% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/AnvilMenu.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AnvilMenu.java.patch diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/BaseSpawner.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/BaseSpawner.java.patch similarity index 100% rename from purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/BaseSpawner.java.patch rename to purpur-server/minecraft-patches/sources/net/minecraft/world/level/BaseSpawner.java.patch