diff --git a/gradle.properties b/gradle.properties index 21462dd14..2538f8144 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,9 @@ group = org.purpurmc.purpur -version = 1.21.10-R0.1-SNAPSHOT +version = 1.21.11-pre3-R0.1-SNAPSHOT -mcVersion = 1.21.10 -paperCommit = f8cf03d68ccd498cc7c5be434f1269ead112aaf4 +mcVersion = 1.21.11-pre3 +apiVersion=1.21.11 +paperCommit = fb7bd2f18c2fdd4484ce2d84ae5bdd450b3a297a org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-api/build.gradle.kts.patch b/purpur-api/build.gradle.kts.patch index b69bb53d9..29b8a2f14 100644 --- a/purpur-api/build.gradle.kts.patch +++ b/purpur-api/build.gradle.kts.patch @@ -1,6 +1,6 @@ --- a/paper-api/build.gradle.kts +++ b/paper-api/build.gradle.kts -@@ -89,7 +_,7 @@ +@@ -91,7 +_,7 @@ testRuntimeOnly("org.junit.platform:junit-platform-launcher") } @@ -9,7 +9,7 @@ idea { module { generatedSourceDirs.add(generatedDir.toFile()) -@@ -99,6 +_,18 @@ +@@ -101,6 +_,18 @@ main { java { srcDir(generatedDir) @@ -28,7 +28,7 @@ } } } -@@ -164,8 +_,9 @@ +@@ -182,8 +_,9 @@ val services = objects.newInstance() tasks.withType().configureEach { @@ -39,7 +39,7 @@ options.use() options.isDocFilesSubDirs = true options.links( -@@ -198,11 +_,11 @@ +@@ -216,11 +_,11 @@ } // workaround for https://github.com/gradle/gradle/issues/4046 diff --git a/purpur-server/build.gradle.kts.patch b/purpur-server/build.gradle.kts.patch index 13f24b725..a90912979 100644 --- a/purpur-server/build.gradle.kts.patch +++ b/purpur-server/build.gradle.kts.patch @@ -8,7 +8,7 @@ plugins { `java-library` -@@ -23,6 +_,18 @@ +@@ -22,6 +_,18 @@ minecraftVersion = providers.gradleProperty("mcVersion") gitFilePatches = false @@ -25,7 +25,7 @@ + // Purpur end - Rebrand + spigot { - enabled = true + enabled = false buildDataRef = "42d18d4c4653ffc549778dbe223f6994a031d69e" @@ -104,7 +_,21 @@ } @@ -70,7 +70,7 @@ // Deps that were previously in the API but have now been moved here for backwards compat, eventually to be removed runtimeOnly("commons-lang:commons-lang:2.6") runtimeOnly("org.xerial:sqlite-jdbc:3.49.1.0") -@@ -197,14 +_,14 @@ +@@ -198,14 +_,14 @@ val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim() attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", @@ -90,7 +90,7 @@ "Build-Number" to (build ?: ""), "Build-Time" to buildTime.toString(), "Git-Branch" to gitBranch, -@@ -263,7 +_,7 @@ +@@ -264,7 +_,7 @@ jvmArgumentProviders.add(provider) } @@ -99,7 +99,7 @@ idea { module { generatedSourceDirs.add(generatedDir.toFile()) -@@ -355,7 +_,7 @@ +@@ -356,7 +_,7 @@ mainClass.set(null as String?) } @@ -108,7 +108,7 @@ project("paper") versionFamily(paperweight.minecraftVersion.map { it.split(".", "-").takeWhile { part -> part.toIntOrNull() != null }.take(2).joinToString(".") }) version(paperweight.minecraftVersion) -@@ -370,4 +_,44 @@ +@@ -371,4 +_,44 @@ } } } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/GameTestHelper.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/GameTestHelper.java.patch deleted file mode 100644 index 36cabb8eb..000000000 --- a/purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/GameTestHelper.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/minecraft/gametest/framework/GameTestHelper.java -+++ b/net/minecraft/gametest/framework/GameTestHelper.java -@@ -312,6 +_,8 @@ - return gameType; - } - -+ public void setAfk(final boolean afk) {} // Purpur - AFK API -+ - @Override - public boolean isClientAuthoritative() { - return false; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/attributes/RangedAttribute.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/attributes/RangedAttribute.java.patch deleted file mode 100644 index 4cd99d012..000000000 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/attributes/RangedAttribute.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/net/minecraft/world/entity/ai/attributes/RangedAttribute.java -+++ b/net/minecraft/world/entity/ai/attributes/RangedAttribute.java -@@ -29,6 +_,7 @@ - - @Override - public double sanitizeValue(double value) { -+ if (!org.purpurmc.purpur.PurpurConfig.clampAttributes) return Double.isNaN(value) ? this.minValue : value; // Purpur - Add attribute clamping and armor limit config - return Double.isNaN(value) ? this.minValue : Mth.clamp(value, this.minValue, this.maxValue); - } - } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch deleted file mode 100644 index bca7321cd..000000000 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/net/minecraft/world/inventory/AbstractContainerMenu.java -+++ b/net/minecraft/world/inventory/AbstractContainerMenu.java -@@ -65,6 +_,7 @@ - @Nullable - private ContainerSynchronizer synchronizer; - private boolean suppressRemoteUpdates; -+ @Nullable protected ItemStack activeQuickItem = null; // Purpur - Anvil API - // CraftBukkit start - public boolean checkReachable = true; - public abstract org.bukkit.inventory.InventoryView getBukkitView(); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/ItemCombinerMenu.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/ItemCombinerMenu.java.patch deleted file mode 100644 index e674780eb..000000000 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/ItemCombinerMenu.java.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/net/minecraft/world/inventory/ItemCombinerMenu.java -+++ b/net/minecraft/world/inventory/ItemCombinerMenu.java -@@ -155,7 +_,9 @@ - return ItemStack.EMPTY; - } - -+ this.activeQuickItem = itemStack; // Purpur - Anvil API - slot.onTake(player, item); -+ this.activeQuickItem = null; // Purpur - Anvil API - } - - return itemStack; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ProjectileWeaponItem.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ProjectileWeaponItem.java.patch deleted file mode 100644 index 3fa0c2dfa..000000000 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ProjectileWeaponItem.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/minecraft/world/item/ProjectileWeaponItem.java -+++ b/net/minecraft/world/item/ProjectileWeaponItem.java -@@ -106,6 +_,8 @@ - abstractArrow.setCritArrow(true); - } - -+ abstractArrow.setActualEnchantments(weapon.getEnchantments()); // Purpur - Add an option to fix MC-3304 projectile looting -+ - return abstractArrow; - } - diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java.patch deleted file mode 100644 index fd6497469..000000000 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java -+++ b/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java -@@ -39,6 +_,7 @@ - } - - protected static boolean scanForWater(BlockState state, BlockGetter level, BlockPos pos) { -+ if (!((net.minecraft.world.level.LevelAccessor) level).getMinecraftWorld().purpurConfig.coralDieOutsideWater) return true; // Purpur - Config to not let coral die - if (state.getValue(WATERLOGGED)) { - return true; - } else { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BigDripleafBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BigDripleafBlock.java.patch deleted file mode 100644 index 20fb7e9e1..000000000 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BigDripleafBlock.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/minecraft/world/level/block/BigDripleafBlock.java -+++ b/net/minecraft/world/level/block/BigDripleafBlock.java -@@ -254,7 +_,7 @@ - playTiltSound(level, pos, sound); - } - -- int _int = DELAY_UNTIL_NEXT_TILT_STATE.getInt(tilt); -+ int _int = level.purpurConfig.bigDripleafTiltDelay.getOrDefault(tilt, -1); // Purpur - Big dripleaf tilt delay - if (_int != -1) { - level.scheduleTick(pos, this, _int); - } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DragonEggBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DragonEggBlock.java.patch deleted file mode 100644 index d08f61da6..000000000 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DragonEggBlock.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/net/minecraft/world/level/block/DragonEggBlock.java -+++ b/net/minecraft/world/level/block/DragonEggBlock.java -@@ -46,6 +_,7 @@ - } - - private void teleport(BlockState state, Level level, BlockPos pos) { -+ if (!level.purpurConfig.dragonEggTeleport) return; // Purpur - Option to disable dragon egg teleporting - WorldBorder worldBorder = level.getWorldBorder(); - - for (int i = 0; i < 1000; i++) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/HayBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/HayBlock.java.patch deleted file mode 100644 index 1b21c6e0a..000000000 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/HayBlock.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/net/minecraft/world/level/block/HayBlock.java -+++ b/net/minecraft/world/level/block/HayBlock.java -@@ -23,6 +_,6 @@ - - @Override - public void fallOn(Level level, BlockState state, BlockPos pos, Entity entity, double fallDistance) { -- entity.causeFallDamage(fallDistance, 0.2F, level.damageSources().fall()); -+ super.fallOn(level, state, pos, entity, fallDistance); // Purpur - Configurable block fall damage modifiers - } - } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/KelpBlock.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/KelpBlock.java.patch deleted file mode 100644 index b0ce9ac1a..000000000 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/KelpBlock.java.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/net/minecraft/world/level/block/KelpBlock.java -+++ b/net/minecraft/world/level/block/KelpBlock.java -@@ -72,4 +_,11 @@ - protected FluidState getFluidState(BlockState state) { - return Fluids.WATER.getSource(false); - } -+ -+ // Purpur start - kelp vines configurable max growth age -+ @Override -+ public int getMaxGrowthAge() { -+ return org.purpurmc.purpur.PurpurConfig.kelpMaxGrowthAge; -+ } -+ // Purpur end - kelp vines configurable max growth age - } diff --git a/purpur-server/minecraft-patches/features/0001-Ridables.patch b/purpur-server/minecraft-patches/unapplied-features/0001-Ridables.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0001-Ridables.patch rename to purpur-server/minecraft-patches/unapplied-features/0001-Ridables.patch diff --git a/purpur-server/minecraft-patches/features/0002-Configurable-entity-base-attributes.patch b/purpur-server/minecraft-patches/unapplied-features/0002-Configurable-entity-base-attributes.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0002-Configurable-entity-base-attributes.patch rename to purpur-server/minecraft-patches/unapplied-features/0002-Configurable-entity-base-attributes.patch diff --git a/purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch b/purpur-server/minecraft-patches/unapplied-features/0003-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch rename to purpur-server/minecraft-patches/unapplied-features/0003-Barrels-and-enderchests-6-rows.patch diff --git a/purpur-server/minecraft-patches/features/0004-Giants-AI-settings.patch b/purpur-server/minecraft-patches/unapplied-features/0004-Giants-AI-settings.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0004-Giants-AI-settings.patch rename to purpur-server/minecraft-patches/unapplied-features/0004-Giants-AI-settings.patch diff --git a/purpur-server/minecraft-patches/features/0005-Chickens-can-retaliate.patch b/purpur-server/minecraft-patches/unapplied-features/0005-Chickens-can-retaliate.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0005-Chickens-can-retaliate.patch rename to purpur-server/minecraft-patches/unapplied-features/0005-Chickens-can-retaliate.patch diff --git a/purpur-server/minecraft-patches/features/0006-Minecart-settings-and-WASD-controls.patch b/purpur-server/minecraft-patches/unapplied-features/0006-Minecart-settings-and-WASD-controls.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0006-Minecart-settings-and-WASD-controls.patch rename to purpur-server/minecraft-patches/unapplied-features/0006-Minecart-settings-and-WASD-controls.patch diff --git a/purpur-server/minecraft-patches/features/0007-Villagers-follow-emerald-blocks.patch b/purpur-server/minecraft-patches/unapplied-features/0007-Villagers-follow-emerald-blocks.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0007-Villagers-follow-emerald-blocks.patch rename to purpur-server/minecraft-patches/unapplied-features/0007-Villagers-follow-emerald-blocks.patch diff --git a/purpur-server/minecraft-patches/features/0008-Implement-elytra-settings.patch b/purpur-server/minecraft-patches/unapplied-features/0008-Implement-elytra-settings.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0008-Implement-elytra-settings.patch rename to purpur-server/minecraft-patches/unapplied-features/0008-Implement-elytra-settings.patch diff --git a/purpur-server/minecraft-patches/features/0009-Configurable-jockey-options.patch b/purpur-server/minecraft-patches/unapplied-features/0009-Configurable-jockey-options.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0009-Configurable-jockey-options.patch rename to purpur-server/minecraft-patches/unapplied-features/0009-Configurable-jockey-options.patch diff --git a/purpur-server/minecraft-patches/features/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/purpur-server/minecraft-patches/unapplied-features/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to purpur-server/minecraft-patches/unapplied-features/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch diff --git a/purpur-server/minecraft-patches/features/0011-Phantoms-burn-in-light.patch b/purpur-server/minecraft-patches/unapplied-features/0011-Phantoms-burn-in-light.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0011-Phantoms-burn-in-light.patch rename to purpur-server/minecraft-patches/unapplied-features/0011-Phantoms-burn-in-light.patch diff --git a/purpur-server/minecraft-patches/features/0012-Make-entity-breeding-times-configurable.patch b/purpur-server/minecraft-patches/unapplied-features/0012-Make-entity-breeding-times-configurable.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0012-Make-entity-breeding-times-configurable.patch rename to purpur-server/minecraft-patches/unapplied-features/0012-Make-entity-breeding-times-configurable.patch diff --git a/purpur-server/minecraft-patches/features/0013-Apply-display-names-from-item-forms-of-entities-to-e.patch b/purpur-server/minecraft-patches/unapplied-features/0013-Apply-display-names-from-item-forms-of-entities-to-e.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0013-Apply-display-names-from-item-forms-of-entities-to-e.patch rename to purpur-server/minecraft-patches/unapplied-features/0013-Apply-display-names-from-item-forms-of-entities-to-e.patch diff --git a/purpur-server/minecraft-patches/features/0014-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/purpur-server/minecraft-patches/unapplied-features/0014-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0014-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch rename to purpur-server/minecraft-patches/unapplied-features/0014-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch diff --git a/purpur-server/minecraft-patches/features/0015-Add-mobGriefing-override-to-everything-affected.patch b/purpur-server/minecraft-patches/unapplied-features/0015-Add-mobGriefing-override-to-everything-affected.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0015-Add-mobGriefing-override-to-everything-affected.patch rename to purpur-server/minecraft-patches/unapplied-features/0015-Add-mobGriefing-override-to-everything-affected.patch diff --git a/purpur-server/minecraft-patches/features/0016-Add-EntityTeleportHinderedEvent.patch b/purpur-server/minecraft-patches/unapplied-features/0016-Add-EntityTeleportHinderedEvent.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0016-Add-EntityTeleportHinderedEvent.patch rename to purpur-server/minecraft-patches/unapplied-features/0016-Add-EntityTeleportHinderedEvent.patch diff --git a/purpur-server/minecraft-patches/features/0017-Toggle-for-water-sensitive-mob-damage.patch b/purpur-server/minecraft-patches/unapplied-features/0017-Toggle-for-water-sensitive-mob-damage.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0017-Toggle-for-water-sensitive-mob-damage.patch rename to purpur-server/minecraft-patches/unapplied-features/0017-Toggle-for-water-sensitive-mob-damage.patch diff --git a/purpur-server/minecraft-patches/features/0018-API-for-any-mob-to-burn-daylight.patch b/purpur-server/minecraft-patches/unapplied-features/0018-API-for-any-mob-to-burn-daylight.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0018-API-for-any-mob-to-burn-daylight.patch rename to purpur-server/minecraft-patches/unapplied-features/0018-API-for-any-mob-to-burn-daylight.patch diff --git a/purpur-server/minecraft-patches/features/0019-Cows-naturally-aggressive-to-players-chance.patch b/purpur-server/minecraft-patches/unapplied-features/0019-Cows-naturally-aggressive-to-players-chance.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0019-Cows-naturally-aggressive-to-players-chance.patch rename to purpur-server/minecraft-patches/unapplied-features/0019-Cows-naturally-aggressive-to-players-chance.patch diff --git a/purpur-server/minecraft-patches/features/0020-Mobs-always-drop-experience.patch b/purpur-server/minecraft-patches/unapplied-features/0020-Mobs-always-drop-experience.patch similarity index 100% rename from purpur-server/minecraft-patches/features/0020-Mobs-always-drop-experience.patch rename to purpur-server/minecraft-patches/unapplied-features/0020-Mobs-always-drop-experience.patch diff --git a/purpur-server/minecraft-patches/sources/io/papermc/paper/entity/activation/ActivationRange.java.patch b/purpur-server/minecraft-patches/unapplied-sources/io/papermc/paper/entity/activation/ActivationRange.java.patch similarity index 67% rename from purpur-server/minecraft-patches/sources/io/papermc/paper/entity/activation/ActivationRange.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/io/papermc/paper/entity/activation/ActivationRange.java.patch index e0eadeef9..8d0344f08 100644 --- a/purpur-server/minecraft-patches/sources/io/papermc/paper/entity/activation/ActivationRange.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/io/papermc/paper/entity/activation/ActivationRange.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java +index ae2bb9a73106febfe5f0d090abd4252bbb5fd27e..ca21597263cb430e2a5ae07e8cecfb0d53a270d2 100644 --- a/io/papermc/paper/entity/activation/ActivationRange.java +++ b/io/papermc/paper/entity/activation/ActivationRange.java -@@ -147,6 +_,8 @@ +@@ -147,6 +147,8 @@ public final class ActivationRange { continue; } @@ -9,7 +17,7 @@ final int worldHeight = world.getHeight(); ActivationRange.maxBB = player.getBoundingBox().inflate(maxRange, worldHeight, maxRange); ActivationType.MISC.boundingBox = player.getBoundingBox().inflate(miscActivationRange, worldHeight, miscActivationRange); -@@ -288,6 +_,7 @@ +@@ -288,6 +290,7 @@ public final class ActivationRange { * @return */ public static boolean checkIfActive(final Entity entity) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/CrashReport.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/CrashReport.java.patch similarity index 67% rename from purpur-server/minecraft-patches/sources/net/minecraft/CrashReport.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/CrashReport.java.patch index 52cafd0d1..1ee210bd8 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/CrashReport.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/CrashReport.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/CrashReport.java b/net/minecraft/CrashReport.java +index 3e0e88afcf010d9a3d46e48bca5cbdf98fe97544..394443d00e661715439be1e56dddc129947699a4 100644 --- a/net/minecraft/CrashReport.java +++ b/net/minecraft/CrashReport.java -@@ -30,6 +_,7 @@ +@@ -30,6 +30,7 @@ public class CrashReport { private boolean trackingStackTrace = true; private StackTraceElement[] uncategorizedStackTrace = new StackTraceElement[0]; private final SystemReport systemReport = new SystemReport(); @@ -8,7 +16,7 @@ public CrashReport(String title, Throwable exception) { io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(exception); // Paper -@@ -130,7 +_,7 @@ +@@ -130,7 +131,7 @@ public class CrashReport { } public String getFriendlyReport(ReportType type) { @@ -17,7 +25,7 @@ } @Nullable -@@ -161,7 +_,7 @@ +@@ -161,7 +162,7 @@ public class CrashReport { } public boolean saveToFile(Path path, ReportType type) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/commands/CommandSourceStack.java.patch similarity index 74% rename from purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/commands/CommandSourceStack.java.patch index 007fa82c9..a4986b71a 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/commands/CommandSourceStack.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/commands/CommandSourceStack.java b/net/minecraft/commands/CommandSourceStack.java +index be42e2bd05a7468911698e53a33d87abf4a1080b..d3d967cd922a6e5129546cad9d8fa5565960f6a5 100644 --- a/net/minecraft/commands/CommandSourceStack.java +++ b/net/minecraft/commands/CommandSourceStack.java -@@ -447,6 +_,19 @@ +@@ -447,6 +447,19 @@ public class CommandSourceStack implements ExecutionCommandSource io.papermc.paper.adventure.PaperAdventure.asVanilla(message), broadcastToOps); + } + // Purpur end - Purpur config files - ++ public void sendSuccess(Supplier messageSupplier, boolean allowLogging) { boolean flag = this.source.acceptsSuccess() && !this.silent; + boolean flag1 = allowLogging && this.source.shouldInformAdmins() && !this.silent; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/commands/Commands.java.patch similarity index 84% rename from purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/commands/Commands.java.patch index cd2d954a9..8c32dba08 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/commands/Commands.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java +index 83f05b042630891d43cfb567e98666831df80f6e..9aa09e11032f539952edeeed119f7705c330db0a 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java -@@ -255,11 +_,11 @@ +@@ -255,11 +255,11 @@ public class Commands { JfrCommand.register(this.dispatcher); } @@ -14,7 +22,7 @@ RaidCommand.register(this.dispatcher, context); DebugPathCommand.register(this.dispatcher); DebugMobSpawningCommand.register(this.dispatcher); -@@ -287,6 +_,14 @@ +@@ -287,6 +287,14 @@ public class Commands { StopCommand.register(this.dispatcher); TransferCommand.register(this.dispatcher); WhitelistCommand.register(this.dispatcher); @@ -29,7 +37,7 @@ } if (selection.includeIntegrated) { -@@ -511,6 +_,7 @@ +@@ -511,6 +519,7 @@ public class Commands { private void runSync(ServerPlayer player, java.util.Collection bukkit, RootCommandNode rootCommandNode) { // Paper end - Perf: Async command map building new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent(player.getBukkitEntity(), (RootCommandNode) rootCommandNode, true).callEvent(); // Paper - Brigadier API @@ -37,7 +45,7 @@ org.bukkit.event.player.PlayerCommandSendEvent event = new org.bukkit.event.player.PlayerCommandSendEvent(player.getBukkitEntity(), new java.util.LinkedHashSet<>(bukkit)); event.getPlayer().getServer().getPluginManager().callEvent(event); -@@ -521,6 +_,8 @@ +@@ -521,6 +530,8 @@ public class Commands { } } // CraftBukkit end diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/commands/arguments/selector/EntitySelector.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/commands/arguments/selector/EntitySelector.java.patch similarity index 85% rename from purpur-server/minecraft-patches/sources/net/minecraft/commands/arguments/selector/EntitySelector.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/commands/arguments/selector/EntitySelector.java.patch index a4c56c29d..28fa321ba 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/commands/arguments/selector/EntitySelector.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/commands/arguments/selector/EntitySelector.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/commands/arguments/selector/EntitySelector.java b/net/minecraft/commands/arguments/selector/EntitySelector.java +index d438e31a082b675d7eb0eead7067a0b92363a9f9..a65ca0b1a44f8c993fad7f230a9c0b11a474e358 100644 --- a/net/minecraft/commands/arguments/selector/EntitySelector.java +++ b/net/minecraft/commands/arguments/selector/EntitySelector.java -@@ -193,26 +_,27 @@ +@@ -193,26 +193,27 @@ public class EntitySelector { this.checkPermissions(source); if (this.playerName != null) { ServerPlayer playerByName = source.getServer().getPlayerList().getPlayerByName(this.playerName); @@ -32,7 +40,7 @@ players.add(serverPlayer1); if (players.size() >= resultLimit) { return players; -@@ -271,4 +_,10 @@ +@@ -271,4 +272,10 @@ public class EntitySelector { public static Component joinNames(List names) { return ComponentUtils.formatList(names, Entity::getDisplayName); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/core/BlockPos.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/core/BlockPos.java.patch similarity index 53% rename from purpur-server/minecraft-patches/sources/net/minecraft/core/BlockPos.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/core/BlockPos.java.patch index e22b045b1..d4f4d4dc9 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/core/BlockPos.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/core/BlockPos.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/core/BlockPos.java b/net/minecraft/core/BlockPos.java +index 5083959b61ec88868c0ede65a46087608e22983a..0ae78eecdb6556ff85018d49af4c183da5276c2d 100644 --- a/net/minecraft/core/BlockPos.java +++ b/net/minecraft/core/BlockPos.java -@@ -64,6 +_,12 @@ +@@ -64,6 +64,12 @@ public class BlockPos extends Vec3i { public static final int MAX_HORIZONTAL_COORDINATE = 33554431; // Paper end - Optimize Bit Operations by inlining diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch similarity index 77% rename from purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch index 658be117e..78953db1c 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/core/dispenser/DispenseItemBehavior.java b/net/minecraft/core/dispenser/DispenseItemBehavior.java +index ef72c5d1b6196582cadb87944f3416881f56c8df..5d0eb3893a0cca99ef53c2095b7b36a145dc15be 100644 --- a/net/minecraft/core/dispenser/DispenseItemBehavior.java +++ b/net/minecraft/core/dispenser/DispenseItemBehavior.java -@@ -746,5 +_,22 @@ +@@ -746,5 +746,22 @@ public interface DispenseItemBehavior { DispenserBlock.registerBehavior(Items.TNT_MINECART, new MinecartDispenseItemBehavior(EntityType.TNT_MINECART)); DispenserBlock.registerBehavior(Items.HOPPER_MINECART, new MinecartDispenseItemBehavior(EntityType.HOPPER_MINECART)); DispenserBlock.registerBehavior(Items.COMMAND_BLOCK_MINECART, new MinecartDispenseItemBehavior(EntityType.COMMAND_BLOCK_MINECART)); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java.patch similarity index 62% rename from purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java.patch index 9a2c1e083..0a25645cd 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java b/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java +index e2d169b45f1dba6559ca337b07a110f79d3db504..727d04a442053f6d0c4df3e744554e2866fa38cd 100644 --- a/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java +++ b/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java -@@ -32,7 +_,7 @@ +@@ -32,7 +32,7 @@ public class EquipmentDispenseItemBehavior extends DefaultDispenseItemBehavior { return false; } else { LivingEntity livingEntity = entitiesOfClass.getFirst(); diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/gametest/framework/GameTestHelper.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/gametest/framework/GameTestHelper.java.patch new file mode 100644 index 000000000..1b91ba39f --- /dev/null +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/gametest/framework/GameTestHelper.java.patch @@ -0,0 +1,19 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/gametest/framework/GameTestHelper.java b/net/minecraft/gametest/framework/GameTestHelper.java +index be306c0b3346d1226e2c6d70ebfd83120f4bc124..6c452f195055afb489f828bfac9f23217ba7653d 100644 +--- a/net/minecraft/gametest/framework/GameTestHelper.java ++++ b/net/minecraft/gametest/framework/GameTestHelper.java +@@ -312,6 +312,8 @@ public class GameTestHelper { + return gameType; + } + ++ public void setAfk(final boolean afk) {} // Purpur - AFK API ++ + @Override + public boolean isClientAuthoritative() { + return false; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/TestCommand.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/gametest/framework/TestCommand.java.patch similarity index 54% rename from purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/TestCommand.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/gametest/framework/TestCommand.java.patch index c9f48d7e7..0c7cced61 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/gametest/framework/TestCommand.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/gametest/framework/TestCommand.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/gametest/framework/TestCommand.java b/net/minecraft/gametest/framework/TestCommand.java +index f2c97bb3c849dce59964d51633c47a982d1aa164..32338e6b2e5066b22111fab618a7205139a66536 100644 --- a/net/minecraft/gametest/framework/TestCommand.java +++ b/net/minecraft/gametest/framework/TestCommand.java -@@ -443,7 +_,7 @@ +@@ -443,7 +443,7 @@ public class TestCommand { ) ) ); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/network/Connection.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/network/Connection.java.patch similarity index 71% rename from purpur-server/minecraft-patches/sources/net/minecraft/network/Connection.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/network/Connection.java.patch index a205f1711..53ac06f7a 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/network/Connection.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/network/Connection.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java +index 14addbaf68b7ad80490187d12d9c9b00891e2ce1..35b6f8365f4568da7bc0f4e47c39cb3690292aaf 100644 --- a/net/minecraft/network/Connection.java +++ b/net/minecraft/network/Connection.java -@@ -578,11 +_,20 @@ +@@ -578,11 +578,20 @@ public class Connection extends SimpleChannelInboundHandler> { private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper - Buffer joins to world private static int joinAttemptsThisTick; // Paper - Buffer joins to world private static int currTick; // Paper - Buffer joins to world diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/network/chat/SignedMessageChain.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/network/chat/SignedMessageChain.java.patch similarity index 68% rename from purpur-server/minecraft-patches/sources/net/minecraft/network/chat/SignedMessageChain.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/network/chat/SignedMessageChain.java.patch index 60c29bda0..ad514280f 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/network/chat/SignedMessageChain.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/network/chat/SignedMessageChain.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/network/chat/SignedMessageChain.java b/net/minecraft/network/chat/SignedMessageChain.java +index f6eed34b2fd72ab74cc9dc4b99ca184d512c0a66..a3e211edd348c0936757de33a74b9456248b3bd2 100644 --- a/net/minecraft/network/chat/SignedMessageChain.java +++ b/net/minecraft/network/chat/SignedMessageChain.java -@@ -45,7 +_,7 @@ +@@ -45,7 +45,7 @@ public class SignedMessageChain { SignedMessageLink signedMessageLink = SignedMessageChain.this.nextLink; if (signedMessageLink == null) { throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.CHAIN_BROKEN); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/Main.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/Main.java.patch similarity index 75% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/Main.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/Main.java.patch index ff4246900..a53608fa5 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/Main.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/Main.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java +index 2de7072c8ccc005e514673bba494b64d42e95a15..42841fdc7e64311ba9217789a3dc758a351cf674 100644 --- a/net/minecraft/server/Main.java +++ b/net/minecraft/server/Main.java -@@ -107,6 +_,13 @@ +@@ -107,6 +107,13 @@ public class Main { JvmProfiler.INSTANCE.start(Environment.SERVER); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/MinecraftServer.java.patch similarity index 81% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/MinecraftServer.java.patch index 222f74312..015e20c65 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/MinecraftServer.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java +index f63a5567a2e845de904c2dacfbb875049e3e0c65..9337f3fa2daa224d04499fd2bb0fef9c1283ba27 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -286,6 +_,7 @@ +@@ -286,6 +286,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop processQueue = new java.util.concurrent.ConcurrentLinkedQueue(); public int autosavePeriod; // Paper - don't store the vanilla dispatcher -@@ -302,6 +_,8 @@ +@@ -302,6 +303,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop pluginsBlockingSleep = new java.util.HashSet<>(); // Paper - API to allow/disallow tick sleeping public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation @@ -17,7 +25,7 @@ // Paper start - improve tick loop public final ca.spottedleaf.moonrise.common.time.TickData tickTimes1s = new ca.spottedleaf.moonrise.common.time.TickData(java.util.concurrent.TimeUnit.SECONDS.toNanos(1L)); public final ca.spottedleaf.moonrise.common.time.TickData tickTimes5s = new ca.spottedleaf.moonrise.common.time.TickData(java.util.concurrent.TimeUnit.SECONDS.toNanos(5L)); -@@ -371,6 +_,7 @@ +@@ -371,6 +374,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop catchup) { -@@ -1773,7 +_,7 @@ + final long difference = ticksBehind - catchup; +@@ -1773,7 +1800,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java +index fdeca41d40705f28864ce4443d01cd872c9d51b0..10e5469df1800bcdfb3f8cb4045ee25a4bafc58c 100644 --- a/net/minecraft/server/PlayerAdvancements.java +++ b/net/minecraft/server/PlayerAdvancements.java -@@ -147,6 +_,7 @@ +@@ -147,6 +147,7 @@ public class PlayerAdvancements { AdvancementHolder advancementHolder = advancementManager.get(path); if (advancementHolder == null) { if (!path.getNamespace().equals(ResourceLocation.DEFAULT_NAMESPACE)) return; // CraftBukkit @@ -8,7 +16,7 @@ LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", path, this.playerSavePath); } else { this.startProgress(advancementHolder, progress); -@@ -194,6 +_,7 @@ +@@ -194,6 +195,7 @@ public class PlayerAdvancements { advancement.value().display().ifPresent(displayInfo -> { // Paper start - Add Adventure message to PlayerAdvancementDoneEvent if (event.message() != null && this.player.level().getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/EnchantCommand.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/commands/EnchantCommand.java.patch similarity index 75% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/commands/EnchantCommand.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/commands/EnchantCommand.java.patch index 6379c1d94..33a41f30f 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/EnchantCommand.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/commands/EnchantCommand.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/commands/EnchantCommand.java b/net/minecraft/server/commands/EnchantCommand.java +index 6f4fcee9fdba2248227708fcced1ce0f40aff6af..13f1dbd0d09428e9e0a42f99d0553283e0065f6f 100644 --- a/net/minecraft/server/commands/EnchantCommand.java +++ b/net/minecraft/server/commands/EnchantCommand.java -@@ -70,7 +_,7 @@ +@@ -70,7 +70,7 @@ public class EnchantCommand { private static int enchant(CommandSourceStack source, Collection targets, Holder enchantment, int level) throws CommandSyntaxException { Enchantment enchantment1 = enchantment.value(); @@ -9,7 +17,7 @@ throw ERROR_LEVEL_TOO_HIGH.create(level, enchantment1.getMaxLevel()); } else { int i = 0; -@@ -80,7 +_,7 @@ +@@ -80,7 +80,7 @@ public class EnchantCommand { ItemStack mainHandItem = livingEntity.getMainHandItem(); if (!mainHandItem.isEmpty()) { if (enchantment1.canEnchant(mainHandItem) diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GameModeCommand.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/commands/GameModeCommand.java.patch similarity index 69% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GameModeCommand.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/commands/GameModeCommand.java.patch index 4890d3ff6..ad2768000 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GameModeCommand.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/commands/GameModeCommand.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/commands/GameModeCommand.java b/net/minecraft/server/commands/GameModeCommand.java +index 99b9408a025a0edb054aa2db3b743df4498c4f97..b56d990b172db5be8633f1fb3d8aaef1f69390b8 100644 --- a/net/minecraft/server/commands/GameModeCommand.java +++ b/net/minecraft/server/commands/GameModeCommand.java -@@ -53,6 +_,18 @@ +@@ -53,6 +53,18 @@ public class GameModeCommand { } private static int setMode(CommandContext context, Collection players, GameType gameType) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GiveCommand.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/commands/GiveCommand.java.patch similarity index 62% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GiveCommand.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/commands/GiveCommand.java.patch index e7a366475..4e9c538ec 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GiveCommand.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/commands/GiveCommand.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/commands/GiveCommand.java b/net/minecraft/server/commands/GiveCommand.java +index 4f56cdcf658234b1ca92d38c3df3d31e9be34a15..945d7c0b31fe9ac029e518af92eebd6e8018a69f 100644 --- a/net/minecraft/server/commands/GiveCommand.java +++ b/net/minecraft/server/commands/GiveCommand.java -@@ -69,6 +_,7 @@ +@@ -69,6 +69,7 @@ public class GiveCommand { i1 -= min; ItemStack itemStack1 = item.createItemStack(min, false); boolean flag = serverPlayer.getInventory().add(itemStack1); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/dedicated/DedicatedServer.java.patch similarity index 81% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/dedicated/DedicatedServer.java.patch index 96432590f..a5f2a3b04 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/dedicated/DedicatedServer.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java +index 354b48c88b113c4048e258f2402aad2647d3c364..e728611fc4148f88d5c4f964af6f17a7b7ee9581 100644 --- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java -@@ -198,6 +_,7 @@ +@@ -198,6 +198,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface public void run() { if (!org.bukkit.craftbukkit.Main.useConsole) return; // CraftBukkit // Paper start - Use TerminalConsoleAppender @@ -8,7 +16,7 @@ new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start(); /* BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8)); -@@ -276,6 +_,15 @@ +@@ -276,6 +277,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics @@ -24,7 +32,7 @@ com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now // this.worldData.setGameType(properties.gameMode.get()); // CraftBukkit - moved to world loading -@@ -318,6 +_,30 @@ +@@ -318,6 +328,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface if (true) throw new IllegalStateException("Failed to bind to port", var11); // Paper - Propagate failed to bind to port error return false; } @@ -55,13 +63,13 @@ // CraftBukkit start this.server.loadPlugins(); -@@ -392,6 +_,9 @@ - MinecraftServerStatistics.registerJmxMonitoring(this); +@@ -393,6 +427,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface LOGGER.info("JMX monitoring enabled"); } -+ + + org.purpurmc.purpur.task.BossBarTask.startAll(); // Purpur - Implement TPSBar + if (org.purpurmc.purpur.PurpurConfig.beeCountPayload) org.purpurmc.purpur.task.BeehiveTask.instance().register(); // Purpur - Give bee counts in beehives to Purpur clients - ++ this.notificationManager().serverStarted(); return true; + } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch similarity index 61% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch index 7bb7af06e..b0125f993 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/dedicated/DedicatedServerProperties.java b/net/minecraft/server/dedicated/DedicatedServerProperties.java +index e352a29c4a45fd3f397d1cf4586c5f149b4ba0d0..a9cd61f0a7bde931e59f1496191f1f8d465aec5e 100644 --- a/net/minecraft/server/dedicated/DedicatedServerProperties.java +++ b/net/minecraft/server/dedicated/DedicatedServerProperties.java -@@ -55,6 +_,7 @@ +@@ -55,6 +55,7 @@ public class DedicatedServerProperties extends Settings +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/gui/MinecraftServerGui.java b/net/minecraft/server/gui/MinecraftServerGui.java +index f262a7c5ae4e7d56f16f5c0f4f145a2e428abbe4..614c7d9f673c926562acc8fa3b3788623900db41 100644 --- a/net/minecraft/server/gui/MinecraftServerGui.java +++ b/net/minecraft/server/gui/MinecraftServerGui.java -@@ -39,6 +_,11 @@ +@@ -39,6 +39,11 @@ public class MinecraftServerGui extends JComponent { private Thread logAppenderThread; private final Collection finalizers = Lists.newArrayList(); final AtomicBoolean isClosing = new AtomicBoolean(); @@ -12,7 +20,7 @@ public static MinecraftServerGui showFrameFor(final DedicatedServer server) { try { -@@ -46,7 +_,7 @@ +@@ -46,7 +51,7 @@ public class MinecraftServerGui extends JComponent { } catch (Exception var3) { } @@ -21,7 +29,7 @@ final MinecraftServerGui minecraftServerGui = new MinecraftServerGui(server); jFrame.setDefaultCloseOperation(2); jFrame.add(minecraftServerGui); -@@ -54,7 +_,7 @@ +@@ -54,7 +59,7 @@ public class MinecraftServerGui extends JComponent { jFrame.setLocationRelativeTo(null); jFrame.setVisible(true); // Paper start - Improve ServerGUI @@ -30,7 +38,7 @@ try { jFrame.setIconImage(javax.imageio.ImageIO.read(java.util.Objects.requireNonNull(MinecraftServerGui.class.getClassLoader().getResourceAsStream("logo.png")))); } catch (java.io.IOException ignore) { -@@ -64,7 +_,7 @@ +@@ -64,7 +69,7 @@ public class MinecraftServerGui extends JComponent { @Override public void windowClosing(WindowEvent event) { if (!minecraftServerGui.isClosing.getAndSet(true)) { @@ -39,7 +47,7 @@ server.halt(true); minecraftServerGui.runFinalizers(); } -@@ -112,7 +_,7 @@ +@@ -112,7 +117,7 @@ public class MinecraftServerGui extends JComponent { private JComponent buildChatPanel() { JPanel jPanel = new JPanel(new BorderLayout()); @@ -48,7 +56,7 @@ JScrollPane jScrollPane = new JScrollPane(jTextArea, 22, 30); jTextArea.setEditable(false); jTextArea.setFont(MONOSPACED); -@@ -121,10 +_,43 @@ +@@ -121,10 +126,43 @@ public class MinecraftServerGui extends JComponent { String trimmed = jTextField.getText().trim(); if (!trimmed.isEmpty()) { this.server.handleConsoleInput(trimmed, this.server.createCommandSourceStack()); @@ -92,7 +100,7 @@ jTextArea.addFocusListener(new FocusAdapter() { @Override public void focusGained(FocusEvent event) { -@@ -159,7 +_,7 @@ +@@ -159,7 +197,7 @@ public class MinecraftServerGui extends JComponent { } private static final java.util.regex.Pattern ANSI = java.util.regex.Pattern.compile("\\e\\[[\\d;]*[^\\d;]"); // CraftBukkit // Paper @@ -101,7 +109,7 @@ if (!SwingUtilities.isEventDispatchThread()) { SwingUtilities.invokeLater(() -> this.print(textArea, scrollPane, line)); } else { -@@ -170,16 +_,29 @@ +@@ -170,10 +208,11 @@ public class MinecraftServerGui extends JComponent { flag = verticalScrollBar.getValue() + verticalScrollBar.getSize().getHeight() + MONOSPACED.getSize() * 4 > verticalScrollBar.getMaximum(); } @@ -115,10 +123,10 @@ if (flag) { verticalScrollBar.setValue(Integer.MAX_VALUE); - } +@@ -181,6 +220,18 @@ public class MinecraftServerGui extends JComponent { } } -+ + + // Purpur start - GUI Improvements + public static class CommandHistory extends java.util.LinkedList { + @Override @@ -130,6 +138,7 @@ + } + } + // Purpur end - GUI Improvements - ++ // Paper start - Add onboarding message for initial server start private JComponent buildOnboardingPanel() { + String onboardingLink = "https://docs.papermc.io/paper/next-steps"; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/gui/StatsComponent.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/gui/StatsComponent.java.patch similarity index 63% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/gui/StatsComponent.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/gui/StatsComponent.java.patch index a082bca56..03705bb82 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/gui/StatsComponent.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/gui/StatsComponent.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/gui/StatsComponent.java b/net/minecraft/server/gui/StatsComponent.java +index 35fd539eb2bfe60ad17ab1e558a01273666acc54..103ff139dae918c991413ce9df61da3e22ee458a 100644 --- a/net/minecraft/server/gui/StatsComponent.java +++ b/net/minecraft/server/gui/StatsComponent.java -@@ -43,7 +_,7 @@ +@@ -43,7 +43,7 @@ public class StatsComponent extends JComponent { } this.msgs[0] = "Memory use: " + l / 1024L / 1024L + " mb (" + Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory() + "% free)"; this.msgs[1] = "Avg tick: " + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / TimeUtil.NANOSECONDS_PER_MILLISECOND) + " ms"; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerLevel.java.patch similarity index 88% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerLevel.java.patch index 1ef82425d..c1c0e3c2e 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerLevel.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java +index c0ed4e023b35a076b554fa387e9a2324166b2fae..a70c9f9343a5497392d804eb8014b8789c14bafd 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java -@@ -212,6 +_,8 @@ +@@ -212,6 +212,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe private final StructureManager structureManager; private final StructureCheck structureCheck; private final boolean tickTime; @@ -9,7 +17,7 @@ private final RandomSequences randomSequences; final LevelDebugSynchronizers debugSynchronizers = new LevelDebugSynchronizers(this); -@@ -616,8 +_,25 @@ +@@ -616,8 +618,25 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe // CraftBukkit end this.tickTime = tickTime; this.server = server; @@ -36,7 +44,7 @@ ChunkGenerator chunkGenerator = levelStem.generator(); // CraftBukkit start this.serverLevelData.setWorld(this); -@@ -699,6 +_,7 @@ +@@ -699,6 +718,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe this.chunkDataController = new ca.spottedleaf.moonrise.patches.chunk_system.io.datacontroller.ChunkDataController((ServerLevel)(Object)this, this.chunkTaskScheduler); // Paper end - rewrite chunk system this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit @@ -44,7 +52,7 @@ } // Paper start -@@ -745,7 +_,7 @@ +@@ -745,7 +765,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } int _int = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE); @@ -53,7 +61,7 @@ // Paper start - create time skip event - move up calculations final long newDayTime = this.levelData.getDayTime() + 24000L; org.bukkit.event.world.TimeSkipEvent event = new org.bukkit.event.world.TimeSkipEvent( -@@ -879,6 +_,13 @@ +@@ -879,6 +899,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe this.serverLevelData.getScheduledEvents().tick(this.server, l); Profiler.get().pop(); if (this.serverLevelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) { @@ -67,7 +75,7 @@ this.setDayTime(this.levelData.getDayTime() + 1L); } } -@@ -886,6 +_,20 @@ +@@ -886,6 +913,20 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe public void setDayTime(long time) { this.serverLevelData.setDayTime(time); @@ -88,7 +96,7 @@ } public void tickCustomSpawners(boolean spawnEnemies) { -@@ -990,9 +_,17 @@ +@@ -990,9 +1031,17 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe && this.random.nextDouble() < currentDifficultyAt.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01) // Paper - Configurable spawn chances for skeleton horses && !this.getBlockState(blockPos.below()).is(BlockTags.LIGHTNING_RODS); if (flag) { @@ -108,7 +116,7 @@ skeletonHorse.setAge(0); skeletonHorse.setPos(blockPos.getX(), blockPos.getY(), blockPos.getZ()); this.addFreshEntity(skeletonHorse, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit -@@ -1027,9 +_,35 @@ +@@ -1027,9 +1076,35 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe if (blockState.is(Blocks.SNOW)) { int layersValue = blockState.getValue(SnowLayerBlock.LAYERS); if (layersValue < Math.min(_int, 8)) { @@ -144,7 +152,7 @@ } } else { org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, heightmapPos, Blocks.SNOW.defaultBlockState(), 3, null); // CraftBukkit -@@ -1050,7 +_,7 @@ +@@ -1050,7 +1125,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe poiType -> poiType.is(PoiTypes.LIGHTNING_ROD), pos1 -> pos1.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, pos1.getX(), pos1.getZ()) - 1, pos, @@ -153,7 +161,7 @@ PoiManager.Occupancy.ANY ); return optional.map(pos1 -> pos1.above(1)); -@@ -1099,8 +_,26 @@ +@@ -1099,8 +1174,26 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe int _int = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE); Component component; if (this.sleepStatus.areEnoughSleeping(_int)) { @@ -180,7 +188,7 @@ component = Component.translatable("sleep.players_sleeping", this.sleepStatus.amountSleeping(), this.sleepStatus.sleepersNeeded(_int)); } -@@ -1237,6 +_,7 @@ +@@ -1237,6 +1330,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @VisibleForTesting public void resetWeatherCycle() { // CraftBukkit start @@ -188,7 +196,7 @@ this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents // 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.... -@@ -1244,6 +_,7 @@ +@@ -1244,6 +1338,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe this.serverLevelData.setRainTime(0); } // CraftBukkit end @@ -196,7 +204,7 @@ this.serverLevelData.setThundering(false, org.bukkit.event.weather.ThunderChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents // CraftBukkit start // If we stop due to everyone sleeping we should reset the weather duration to some other random value. -@@ -1917,7 +_,7 @@ +@@ -1917,7 +2012,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe Explosion.BlockInteraction blockInteraction = switch (explosionInteraction) { case NONE -> Explosion.BlockInteraction.KEEP; case BLOCK -> this.getDestroyType(GameRules.RULE_BLOCK_EXPLOSION_DROP_DECAY); @@ -205,7 +213,7 @@ ? this.getDestroyType(GameRules.RULE_MOB_EXPLOSION_DROP_DECAY) : Explosion.BlockInteraction.KEEP; case TNT -> this.getDestroyType(GameRules.RULE_TNT_EXPLOSION_DROP_DECAY); -@@ -2794,7 +_,7 @@ +@@ -2794,7 +2889,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe // Spigot start if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message // Paper start - Fix merchant inventory not closing on entity removal diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerPlayer.java.patch similarity index 88% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerPlayer.java.patch index 1d875f64e..a84a97a52 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerPlayer.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java +index b4a996ac6c570e988b38237a32f90ec5042cbc17..d4b57465b7d49f8000de31f75c49f3f7ed333419 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -443,6 +_,9 @@ +@@ -443,6 +443,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc public boolean isRealPlayer; // Paper public @Nullable com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent public @Nullable org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event @@ -10,7 +18,7 @@ // Paper start - rewrite chunk system private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader; -@@ -516,6 +_,9 @@ +@@ -516,6 +519,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc this.respawnConfig = input.read("respawn", ServerPlayer.RespawnConfig.CODEC).orElse(null); this.spawnExtraParticlesOnFall = input.getBooleanOr("spawn_extra_particles_on_fall", false); this.raidOmenPosition = input.read("raid_omen_position", BlockPos.CODEC).orElse(null); @@ -20,7 +28,7 @@ // Paper start - Expand PlayerGameModeChangeEvent this.loadGameTypes(input); } -@@ -557,6 +_,9 @@ +@@ -557,6 +563,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc output.store("ShoulderEntityRight", CompoundTag.CODEC, this.getShoulderEntityRight()); } this.getBukkitEntity().setExtraData(output); // CraftBukkit @@ -30,7 +38,7 @@ } private void saveParentVehicle(ValueOutput output) { -@@ -1186,6 +_,7 @@ +@@ -1186,6 +1195,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc // Paper - moved up to sendClientboundPlayerCombatKillPacket() sendClientboundPlayerCombatKillPacket(event.getShowDeathMessages(), deathScreenMessage); // Paper - Expand PlayerDeathEvent Team team = this.getTeam(); @@ -38,7 +46,7 @@ if (team == null || team.getDeathMessageVisibility() == Team.Visibility.ALWAYS) { this.server.getPlayerList().broadcastSystemMessage(deathMessage, false); } else if (team.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) { -@@ -1293,6 +_,13 @@ +@@ -1293,6 +1303,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc if (this.isInvulnerableTo(level, damageSource)) { return false; } else { @@ -52,7 +60,7 @@ Entity entity = damageSource.getEntity(); if (!( // Paper - split the if statement. If below statement is false, hurtServer would not have been evaluated. Return false. !(entity instanceof Player player && !this.canHarmPlayer(player)) -@@ -1546,6 +_,7 @@ +@@ -1546,6 +1563,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc profilerFiller.pop(); profilerFiller.push("placing"); @@ -60,7 +68,7 @@ this.setServerLevel(level); this.connection.internalTeleport(PositionMoveRotation.of(teleportTransition), teleportTransition.relatives()); // CraftBukkit - use internal teleport without event this.connection.resetPosition(); -@@ -1647,7 +_,7 @@ +@@ -1647,7 +1665,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc new AABB(vec3.x() - 8.0, vec3.y() - 5.0, vec3.z() - 8.0, vec3.x() + 8.0, vec3.y() + 5.0, vec3.z() + 8.0), monster -> monster.isPreventingPlayerRest(this.level(), this) ); @@ -69,7 +77,7 @@ return Either.left(Player.BedSleepingProblem.NOT_SAFE); } } -@@ -1684,7 +_,19 @@ +@@ -1684,7 +1702,19 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc CriteriaTriggers.SLEPT_IN_BED.trigger(this); }); if (!this.level().canSleepThroughNights()) { @@ -90,7 +98,7 @@ } this.level().updateSleepingPlayerList(); -@@ -1776,6 +_,7 @@ +@@ -1776,6 +1806,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc @Override public void openTextEdit(SignBlockEntity signEntity, boolean isFrontText) { @@ -98,7 +106,7 @@ this.connection.send(new ClientboundBlockUpdatePacket(this.level(), signEntity.getBlockPos())); this.connection.send(new ClientboundOpenSignEditorPacket(signEntity.getBlockPos(), isFrontText)); } -@@ -2085,6 +_,26 @@ +@@ -2085,6 +2116,26 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc this.lastSentExp = -1; // CraftBukkit - Added to reset } @@ -125,7 +133,7 @@ @Override public void displayClientMessage(Component message, boolean overlay) { this.sendSystemMessage(message, overlay); -@@ -2319,6 +_,20 @@ +@@ -2319,6 +2370,20 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc ); } @@ -146,11 +154,10 @@ public void sendSystemMessage(Component message) { this.sendSystemMessage(message, false); } -@@ -2457,7 +_,67 @@ +@@ -2457,7 +2522,67 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc public void resetLastActionTime() { this.lastActionTime = Util.getMillis(); -- } + this.setAfk(false); // Purpur - AFK API + } + @@ -210,12 +217,12 @@ + @Override + public boolean canBeCollidedWith(Entity entity) { + return !this.isAfk() && super.canBeCollidedWith(entity); -+ } + } + // Purpur end - AFK API public ServerStatsCounter getStats() { return this.stats; -@@ -3098,4 +_,65 @@ +@@ -3098,4 +3223,65 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity(); } // CraftBukkit end diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayerGameMode.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerPlayerGameMode.java.patch similarity index 83% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayerGameMode.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerPlayerGameMode.java.patch index 86afa371d..d87d44941 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayerGameMode.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerPlayerGameMode.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java +index 7166889bce8065508030ecd5b1400ee9be031bf3..fad600f343ee0983efc183f083b1507648987575 100644 --- a/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/net/minecraft/server/level/ServerPlayerGameMode.java -@@ -368,6 +_,7 @@ +@@ -368,6 +368,7 @@ public class ServerPlayerGameMode { } return false; } @@ -8,7 +16,7 @@ } // CraftBukkit end -@@ -485,6 +_,7 @@ +@@ -485,6 +486,7 @@ public class ServerPlayerGameMode { public InteractionHand interactHand; public ItemStack interactItemStack; public InteractionResult useItemOn(ServerPlayer player, Level level, ItemStack stack, InteractionHand hand, BlockHitResult hitResult) { @@ -16,7 +24,7 @@ BlockPos blockPos = hitResult.getBlockPos(); BlockState blockState = level.getBlockState(blockPos); boolean cancelledBlock = false; -@@ -527,7 +_,7 @@ +@@ -527,7 +529,7 @@ public class ServerPlayerGameMode { boolean flag = !player.getMainHandItem().isEmpty() || !player.getOffhandItem().isEmpty(); boolean flag1 = player.isSecondaryUseActive() && flag; ItemStack itemStack = stack.copy(); @@ -25,7 +33,7 @@ InteractionResult interactionResult = blockState.useItemOn(player.getItemInHand(hand), level, player, hand, hitResult); if (interactionResult.consumesAction()) { CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger(player, blockPos, itemStack); -@@ -573,4 +_,18 @@ +@@ -573,4 +575,18 @@ public class ServerPlayerGameMode { public void setLevel(ServerLevel level) { this.level = level; } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/WorldGenRegion.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/WorldGenRegion.java.patch similarity index 50% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/level/WorldGenRegion.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/WorldGenRegion.java.patch index ab71931ac..542db078b 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/WorldGenRegion.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/WorldGenRegion.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/level/WorldGenRegion.java b/net/minecraft/server/level/WorldGenRegion.java +index b8be39ae633e466d764f329f614620f1a2e1ef3f..75f3f8e033c1ef3ed6790dabaf9565b9f08d0ef2 100644 --- a/net/minecraft/server/level/WorldGenRegion.java +++ b/net/minecraft/server/level/WorldGenRegion.java -@@ -314,6 +_,7 @@ +@@ -314,6 +314,7 @@ public class WorldGenRegion implements WorldGenLevel { return true; } else { // Paper start - Buffer OOB setBlock calls diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch similarity index 83% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch index 917904c00..a1cd2b14b 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerCommonPacketListenerImpl.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +index c6db2c96db96453daaf49779f588f75f7c3d3d60..e98400719a4ab43dc0ce90cdca19ba86e4849720 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -@@ -40,10 +_,11 @@ +@@ -40,10 +40,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack public final Connection connection; // Paper private final boolean transferred; //private long keepAliveTime; // Paper - improve keepalives @@ -13,7 +21,7 @@ private volatile int latency; // Paper - improve keepalives - make volatile private final io.papermc.paper.util.KeepAlive keepAlive; // Paper - improve keepalives private volatile boolean suspendFlushingOnServerThread = false; -@@ -54,6 +_,10 @@ +@@ -54,6 +55,10 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack public final java.util.Map packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit protected static final net.minecraft.resources.ResourceLocation MINECRAFT_BRAND = net.minecraft.resources.ResourceLocation.withDefaultNamespace("brand"); // Paper - Brand support @@ -24,7 +32,7 @@ // Paper start - retain certain values public @Nullable String playerBrand; public final java.util.Set pluginMessagerChannels; -@@ -105,6 +_,18 @@ +@@ -105,6 +110,18 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack // Paper start - improve keepalives long now = System.nanoTime(); io.papermc.paper.util.KeepAlive.PendingKeepAlive pending = this.keepAlive.pendingKeepAlives.peek(); @@ -43,7 +51,7 @@ if (pending != null && pending.challengeId() == packet.getId()) { this.keepAlive.pendingKeepAlives.remove(pending); -@@ -179,6 +_,12 @@ +@@ -179,6 +196,12 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack return; } @@ -56,7 +64,7 @@ if (identifier.equals(MINECRAFT_BRAND)) { this.playerBrand = new net.minecraft.network.FriendlyByteBuf(io.netty.buffer.Unpooled.wrappedBuffer(data)).readUtf(256); } -@@ -264,6 +_,23 @@ +@@ -264,6 +287,23 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack Profiler.get().push("keepAlive"); long millis = Util.getMillis(); // Paper start - improve keepalives diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch similarity index 91% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch index 537c07949..ef15dc326 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java +index ef7d44ea1c1582bbf1d544819825778c414fe40d..caae7fc98d13ad92d17b6869b1fe86a79a1f5ba6 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -341,6 +_,20 @@ +@@ -341,6 +341,20 @@ public class ServerGamePacketListenerImpl } // Paper end - configuration phase API @@ -21,7 +29,7 @@ @Override public void tick() { if (this.ackBlockChangesUpTo > -1) { -@@ -358,6 +_,12 @@ +@@ -358,6 +372,12 @@ public class ServerGamePacketListenerImpl && this.server.playerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > TimeUnit.MINUTES.toMillis(this.server.playerIdleTimeout()) && !this.player.wonGame) { @@ -34,7 +42,7 @@ this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause } } -@@ -672,6 +_,8 @@ +@@ -672,6 +692,8 @@ public class ServerGamePacketListenerImpl this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); @@ -43,7 +51,7 @@ Location oldTo = to.clone(); PlayerMoveEvent event = new PlayerMoveEvent(player, from, to); this.cserver.getPluginManager().callEvent(event); -@@ -751,6 +_,7 @@ +@@ -751,6 +773,7 @@ public class ServerGamePacketListenerImpl PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level()); if (packet.getId() == this.awaitingTeleport) { if (this.awaitingPositionFromClient == null) { @@ -51,7 +59,7 @@ this.disconnect(Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause return; } -@@ -1284,6 +_,10 @@ +@@ -1284,6 +1307,10 @@ public class ServerGamePacketListenerImpl final int maxBookPageSize = pageMax.intValue(); final double multiplier = Math.clamp(io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.totalMultiplier, 0.3D, 1D); long byteAllowed = maxBookPageSize; @@ -62,7 +70,7 @@ for (final String page : pageList) { final int byteLength = page.getBytes(java.nio.charset.StandardCharsets.UTF_8).length; byteTotal += byteLength; -@@ -1308,7 +_,8 @@ +@@ -1308,7 +1335,8 @@ public class ServerGamePacketListenerImpl } if (byteTotal > byteAllowed) { @@ -72,7 +80,7 @@ this.disconnectAsync(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause // Paper - add proper async disconnect return; } -@@ -1327,31 +_,45 @@ +@@ -1327,31 +1355,45 @@ public class ServerGamePacketListenerImpl Optional optional = packet.title(); optional.ifPresent(list::add); list.addAll(packet.pages()); @@ -122,7 +130,7 @@ itemStack.set( DataComponents.WRITTEN_BOOK_CONTENT, new WrittenBookContent(this.filterableFromOutgoing(title), this.player.getPlainTextName(), 0, list, true) ); -@@ -1364,6 +_,16 @@ +@@ -1364,6 +1406,16 @@ public class ServerGamePacketListenerImpl return this.player.isTextFilteringEnabled() ? Filterable.passThrough(filteredText.filteredOrEmpty()) : Filterable.from(filteredText); } @@ -139,7 +147,7 @@ @Override public void handleEntityTagQuery(ServerboundEntityTagQueryPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level()); -@@ -1403,7 +_,15 @@ +@@ -1403,7 +1455,15 @@ public class ServerGamePacketListenerImpl @Override public void handleMovePlayer(ServerboundMovePlayerPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level()); @@ -156,7 +164,7 @@ this.disconnect(Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause } else { ServerLevel serverLevel = this.player.level(); -@@ -1585,7 +_,7 @@ +@@ -1585,7 +1645,7 @@ public class ServerGamePacketListenerImpl movedWrongly = true; if (event.getLogWarning()) // Paper end @@ -165,7 +173,7 @@ } // Paper } -@@ -1650,6 +_,8 @@ +@@ -1650,6 +1710,8 @@ public class ServerGamePacketListenerImpl this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); @@ -174,7 +182,7 @@ Location oldTo = to.clone(); PlayerMoveEvent event = new PlayerMoveEvent(player, from, to); this.cserver.getPluginManager().callEvent(event); -@@ -1705,6 +_,13 @@ +@@ -1705,6 +1767,13 @@ public class ServerGamePacketListenerImpl this.player.tryResetCurrentImpulseContext(); } @@ -188,7 +196,7 @@ this.player.checkMovementStatistics(this.player.getX() - x, this.player.getY() - y, this.player.getZ() - z); this.lastGoodX = this.player.getX(); this.lastGoodY = this.player.getY(); -@@ -1722,6 +_,17 @@ +@@ -1722,6 +1791,17 @@ public class ServerGamePacketListenerImpl } } @@ -206,7 +214,7 @@ private boolean shouldCheckPlayerMovement(boolean isElytraMovement) { if (this.isSingleplayerOwner()) { return false; -@@ -2121,6 +_,7 @@ +@@ -2121,6 +2201,7 @@ public class ServerGamePacketListenerImpl boolean cancelled; if (hitResult == null || hitResult.getType() != HitResult.Type.BLOCK) { @@ -214,7 +222,7 @@ org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemInHand, hand); cancelled = event.useItemInHand() == Event.Result.DENY; } else { -@@ -2768,6 +_,7 @@ +@@ -2768,6 +2849,7 @@ public class ServerGamePacketListenerImpl AABB boundingBox = target.getBoundingBox(); if (this.player.canInteractWithEntity(boundingBox, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(3.0))) { // Paper - configurable lenience value for interact range @@ -222,7 +230,7 @@ packet.dispatch( new ServerboundInteractPacket.Handler() { private void performInteraction(InteractionHand hand, ServerGamePacketListenerImpl.EntityInteraction entityInteraction, PlayerInteractEntityEvent event) { // CraftBukkit -@@ -3509,7 +_,7 @@ +@@ -3509,7 +3591,7 @@ public class ServerGamePacketListenerImpl @Override public void handleChangeGameMode(ServerboundChangeGameModePacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level()); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch similarity index 70% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch index bd4e8d893..3135f905c 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +index c5d071c591c844b11667013131d1d3bae8e3bac6..ace65f36d6562988665c530dd3fdbfaa5d2e2071 100644 --- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -@@ -276,7 +_,7 @@ +@@ -276,7 +276,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, ServerLoginPacketListenerImpl.LOGGER.warn("Failed to verify username but will let them in anyway!"); ServerLoginPacketListenerImpl.this.startClientVerification(ServerLoginPacketListenerImpl.this.createOfflineProfile(string1)); // Spigot } else { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerStatusPacketListenerImpl.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerStatusPacketListenerImpl.java.patch similarity index 59% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerStatusPacketListenerImpl.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerStatusPacketListenerImpl.java.patch index 3fc9d014a..7bfc178b2 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerStatusPacketListenerImpl.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerStatusPacketListenerImpl.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/net/minecraft/server/network/ServerStatusPacketListenerImpl.java +index 465559113071a47e706f77a5b0996597ee986b3d..1b966dc52b067cd9d1fa9f500b692e3f75f1cc90 100644 --- a/net/minecraft/server/network/ServerStatusPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerStatusPacketListenerImpl.java -@@ -37,6 +_,7 @@ +@@ -37,6 +37,7 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene } else { this.hasRequestedStatus = true; // this.connection.send(new ClientboundStatusResponsePacket(this.status)); // Paper diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/players/PlayerList.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/players/PlayerList.java.patch similarity index 84% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/players/PlayerList.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/players/PlayerList.java.patch index c4b5f2656..838ef2b91 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/players/PlayerList.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/players/PlayerList.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java +index cc5d1e8007e2ea32605bd68d0a73683e8fb6886e..0c3451caa323ce2553c0d7ee00e7bf8cc8766b2c 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java -@@ -305,6 +_,7 @@ +@@ -305,6 +305,7 @@ public abstract class PlayerList { scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam); } // Paper end - Configurable player collision @@ -8,7 +16,7 @@ // CraftBukkit start - moved down LOGGER.info( "{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", // CraftBukkit - add world name -@@ -425,6 +_,7 @@ +@@ -425,6 +426,7 @@ public abstract class PlayerList { } public @Nullable net.kyori.adventure.text.Component remove(ServerPlayer player, net.kyori.adventure.text.Component leaveMessage) { // Paper end - Fix kick event leave message not being sent @@ -16,7 +24,7 @@ ServerLevel serverLevel = player.level(); player.awardStat(Stats.LEAVE_GAME); // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it -@@ -764,6 +_,20 @@ +@@ -764,6 +766,20 @@ public abstract class PlayerList { } } @@ -37,7 +45,7 @@ public void broadcastAll(Packet packet, ResourceKey dimension) { for (ServerPlayer serverPlayer : this.players) { if (serverPlayer.level().dimension() == dimension) { -@@ -852,12 +_,13 @@ +@@ -852,12 +868,13 @@ public abstract class PlayerList { if (player.connection != null) { byte b; if (permLevel <= 0) { @@ -53,7 +61,7 @@ player.connection.send(new ClientboundEntityEventPacket(player, b)); } -@@ -870,7 +_,7 @@ +@@ -870,7 +887,7 @@ public abstract class PlayerList { // Paper start - whitelist verify event / login event public LoginResult canBypassFullServerLogin(final NameAndId nameAndId, final LoginResult currentResult) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/players/SleepStatus.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/players/SleepStatus.java.patch similarity index 73% rename from purpur-server/minecraft-patches/sources/net/minecraft/server/players/SleepStatus.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/players/SleepStatus.java.patch index 998d2f057..8200079c7 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/players/SleepStatus.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/players/SleepStatus.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/server/players/SleepStatus.java b/net/minecraft/server/players/SleepStatus.java +index 2a7ae521654ad5c9f392baa5562e64bb71b13097..3a3e6992563236141db687084aeec9684437a7db 100644 --- a/net/minecraft/server/players/SleepStatus.java +++ b/net/minecraft/server/players/SleepStatus.java -@@ -15,7 +_,7 @@ +@@ -15,7 +15,7 @@ public class SleepStatus { public boolean areEnoughDeepSleeping(int requiredSleepPercentage, List sleepingPlayers) { // CraftBukkit start @@ -9,7 +17,7 @@ boolean anyDeepSleep = sleepingPlayers.stream().anyMatch(Player::isSleepingLongEnough); return anyDeepSleep && i >= this.sleepersNeeded(requiredSleepPercentage); // CraftBukkit end -@@ -43,7 +_,7 @@ +@@ -43,7 +43,7 @@ public class SleepStatus { for (ServerPlayer serverPlayer : players) { if (!serverPlayer.isSpectator()) { this.activePlayers++; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/stats/ServerRecipeBook.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/stats/ServerRecipeBook.java.patch similarity index 60% rename from purpur-server/minecraft-patches/sources/net/minecraft/stats/ServerRecipeBook.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/stats/ServerRecipeBook.java.patch index a9e87d51d..114c8b02d 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/stats/ServerRecipeBook.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/stats/ServerRecipeBook.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/stats/ServerRecipeBook.java b/net/minecraft/stats/ServerRecipeBook.java +index 736a52c23da313bec6b25a9d1abf08816462403c..2f4f90bf428deb682fe9ec8c1218ae31ebaeea7c 100644 --- a/net/minecraft/stats/ServerRecipeBook.java +++ b/net/minecraft/stats/ServerRecipeBook.java -@@ -106,6 +_,7 @@ +@@ -106,6 +106,7 @@ public class ServerRecipeBook extends RecipeBook { private void loadRecipes(List>> recipes, Consumer>> output, Predicate>> isRecognized) { for (ResourceKey> resourceKey : recipes) { if (!isRecognized.test(resourceKey)) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/util/StringUtil.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/util/StringUtil.java.patch similarity index 52% rename from purpur-server/minecraft-patches/sources/net/minecraft/util/StringUtil.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/util/StringUtil.java.patch index b8d231182..73f110f95 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/util/StringUtil.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/util/StringUtil.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/util/StringUtil.java b/net/minecraft/util/StringUtil.java +index 62fdb8c215552a897c67dd97a302a86afee6d44f..3c5769e0f29d6b3295df568dc461ed521cb04378 100644 --- a/net/minecraft/util/StringUtil.java +++ b/net/minecraft/util/StringUtil.java -@@ -87,6 +_,7 @@ +@@ -87,6 +87,7 @@ public class StringUtil { // Paper start - Username validation public static boolean isReasonablePlayerName(final String name) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatRules.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/damagesource/CombatRules.java.patch similarity index 69% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatRules.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/damagesource/CombatRules.java.patch index 45e676e4b..a12663360 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatRules.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/damagesource/CombatRules.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/damagesource/CombatRules.java b/net/minecraft/world/damagesource/CombatRules.java +index 5f8637dfe4703cb78f486fe49d2e81518cf48715..d27215349f63e73198d23e107a6b634ddef8f7ca 100644 --- a/net/minecraft/world/damagesource/CombatRules.java +++ b/net/minecraft/world/damagesource/CombatRules.java -@@ -15,7 +_,7 @@ +@@ -15,7 +15,7 @@ public class CombatRules { public static float getDamageAfterAbsorb(LivingEntity entity, float damageAmount, DamageSource damageSource, float armorValue, float armorToughness) { float f = 2.0F + armorToughness / 4.0F; @@ -9,7 +17,7 @@ float f2 = f1 / 25.0F; ItemStack weaponItem = damageSource.getWeaponItem(); float f3; -@@ -30,7 +_,7 @@ +@@ -30,7 +30,7 @@ public class CombatRules { } public static float getDamageAfterMagicAbsorb(float damageAmount, float enchantModifiers) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatTracker.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/damagesource/CombatTracker.java.patch similarity index 79% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatTracker.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/damagesource/CombatTracker.java.patch index 2bc01f621..23dec2860 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatTracker.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/damagesource/CombatTracker.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/damagesource/CombatTracker.java b/net/minecraft/world/damagesource/CombatTracker.java +index 4cec197634fac341cca1ed108f1ecb0561f72461..aa6213ca382e4901363317df1e30332c5166f271 100644 --- a/net/minecraft/world/damagesource/CombatTracker.java +++ b/net/minecraft/world/damagesource/CombatTracker.java -@@ -64,7 +_,7 @@ +@@ -64,7 +64,7 @@ public class CombatTracker { private Component getMessageForAssistedFall(Entity entity, Component entityDisplayName, String hasWeaponTranslationKey, String noWeaponTranslationKey) { ItemStack itemStack = entity instanceof LivingEntity livingEntity ? livingEntity.getMainHandItem() : ItemStack.EMPTY; @@ -9,7 +17,7 @@ ? Component.translatable(hasWeaponTranslationKey, this.mob.getDisplayName(), entityDisplayName, itemStack.getDisplayName()) : Component.translatable(noWeaponTranslationKey, this.mob.getDisplayName(), entityDisplayName); } -@@ -108,6 +_,15 @@ +@@ -108,6 +108,15 @@ public class CombatTracker { Component component = ComponentUtils.wrapInSquareBrackets(Component.translatable(string + ".link")).withStyle(INTENTIONAL_GAME_DESIGN_STYLE); return Component.translatable(string + ".message", this.mob.getDisplayName(), component); } else { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSource.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/damagesource/DamageSource.java.patch similarity index 85% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSource.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/damagesource/DamageSource.java.patch index 581f8d027..a981b3c7f 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSource.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/damagesource/DamageSource.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/damagesource/DamageSource.java b/net/minecraft/world/damagesource/DamageSource.java +index bb021fc9de91f8c4f79e6a753d57fa157efbbda7..5fa92eef9c6b88cf96d3fe427e4d4f16953e8094 100644 --- a/net/minecraft/world/damagesource/DamageSource.java +++ b/net/minecraft/world/damagesource/DamageSource.java -@@ -30,6 +_,8 @@ +@@ -30,6 +30,8 @@ public class DamageSource { @Nullable private org.bukkit.block.BlockState fromBlockSnapshot; // Captured block snapshot when the eventBlockDamager is not relevant (e.g. for bad respawn point explosions the block is already removed) private boolean critical; // Supports arrows and sweeping damage @@ -9,7 +17,7 @@ public DamageSource knownCause(final org.bukkit.event.entity.EntityDamageEvent.DamageCause cause) { final DamageSource damageSource = this.copy(); -@@ -42,6 +_,30 @@ +@@ -42,6 +44,30 @@ public class DamageSource { return this.knownCause; } @@ -40,7 +48,7 @@ @Nullable public Entity eventEntityDamager() { return this.eventEntityDamager; -@@ -103,6 +_,8 @@ +@@ -103,6 +129,8 @@ public class DamageSource { damageSource.eventBlockDamager = this.eventBlockDamager; damageSource.fromBlockSnapshot = this.fromBlockSnapshot; damageSource.critical = this.critical; @@ -49,7 +57,7 @@ return damageSource; } // CraftBukkit end -@@ -169,11 +_,20 @@ +@@ -169,12 +197,21 @@ public class DamageSource { } else { Component component = this.causingEntity == null ? this.directEntity.getDisplayName() : this.causingEntity.getDisplayName(); ItemStack itemStack = this.causingEntity instanceof LivingEntity livingEntity1 ? livingEntity1.getMainHandItem() : ItemStack.EMPTY; @@ -59,7 +67,7 @@ : Component.translatable(string, livingEntity.getDisplayName(), component); } } -+ + + // Purpur start - Component related conveniences + public Component getLocalizedDeathMessage(String str, LivingEntity entity) { + net.kyori.adventure.text.Component name = io.papermc.paper.adventure.PaperAdventure.asAdventure(entity.getDisplayName()); @@ -68,6 +76,7 @@ + return io.papermc.paper.adventure.PaperAdventure.asVanilla(component); + } + // Purpur end - Component related conveniences - ++ public String getMsgId() { return this.type().msgId(); + } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSources.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/damagesource/DamageSources.java.patch similarity index 73% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSources.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/damagesource/DamageSources.java.patch index 29006dbaf..5f40ccd7b 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSources.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/damagesource/DamageSources.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/damagesource/DamageSources.java b/net/minecraft/world/damagesource/DamageSources.java +index cc206ecff2d95f0398ca424c178a336ad80cc396..7afad362801082e5f2e3aceda864ad2a7d4e5ebb 100644 --- a/net/minecraft/world/damagesource/DamageSources.java +++ b/net/minecraft/world/damagesource/DamageSources.java -@@ -42,6 +_,8 @@ +@@ -42,6 +42,8 @@ public class DamageSources { private final DamageSource stalagmite; private final DamageSource outsideBorder; private final DamageSource genericKill; @@ -9,7 +17,7 @@ public DamageSources(RegistryAccess registry) { this.damageTypes = registry.lookupOrThrow(Registries.DAMAGE_TYPE); -@@ -70,6 +_,8 @@ +@@ -70,6 +72,8 @@ public class DamageSources { this.stalagmite = this.source(DamageTypes.STALAGMITE); this.outsideBorder = this.source(DamageTypes.OUTSIDE_BORDER); this.genericKill = this.source(DamageTypes.GENERIC_KILL); @@ -18,11 +26,10 @@ } private DamageSource source(ResourceKey damageTypeKey) { -@@ -83,6 +_,18 @@ - private DamageSource source(ResourceKey damageTypeKey, @Nullable Entity causingEntity, @Nullable Entity directEntity) { +@@ -84,6 +88,18 @@ public class DamageSources { return new DamageSource(this.damageTypes.getOrThrow(damageTypeKey), causingEntity, directEntity); } -+ + + // Purpur start - Dont run with scissor + public DamageSource scissors() { + return this.scissors; @@ -34,6 +41,7 @@ + return this.stonecutter; + } + // Purpur end - Stonecutter damage - ++ public DamageSource inFire() { return this.inFire; + } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/HungerMobEffect.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/HungerMobEffect.java.patch similarity index 62% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/effect/HungerMobEffect.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/HungerMobEffect.java.patch index ea284de7b..5e3467d05 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/HungerMobEffect.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/HungerMobEffect.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/effect/HungerMobEffect.java b/net/minecraft/world/effect/HungerMobEffect.java +index 0890694ae96b6cd60079c34066e7a6e288f038e8..6c0e6bd2a171edc57dec71af178764454de73313 100644 --- a/net/minecraft/world/effect/HungerMobEffect.java +++ b/net/minecraft/world/effect/HungerMobEffect.java -@@ -12,7 +_,7 @@ +@@ -12,7 +12,7 @@ class HungerMobEffect extends MobEffect { @Override public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) { if (entity instanceof Player player) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/PoisonMobEffect.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/PoisonMobEffect.java.patch similarity index 63% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/effect/PoisonMobEffect.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/PoisonMobEffect.java.patch index 0e8d7e3f7..a9651e9fb 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/PoisonMobEffect.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/PoisonMobEffect.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/effect/PoisonMobEffect.java b/net/minecraft/world/effect/PoisonMobEffect.java +index 75327fd96858fd508ea63a6983e5cbc655a8800f..73cfc61ac3f8e33e6b9f4fd08a292266c0adb535 100644 --- a/net/minecraft/world/effect/PoisonMobEffect.java +++ b/net/minecraft/world/effect/PoisonMobEffect.java -@@ -12,8 +_,8 @@ +@@ -12,8 +12,8 @@ public class PoisonMobEffect extends MobEffect { @Override public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/RegenerationMobEffect.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/RegenerationMobEffect.java.patch similarity index 57% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/effect/RegenerationMobEffect.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/RegenerationMobEffect.java.patch index f19f319af..6ecb7f8a3 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/RegenerationMobEffect.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/RegenerationMobEffect.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/effect/RegenerationMobEffect.java b/net/minecraft/world/effect/RegenerationMobEffect.java +index 76cffa4d4d18d6c04749d941dbdf5eb60aed4095..81481267a1577721dcc405f39a4c350bd59ac9a2 100644 --- a/net/minecraft/world/effect/RegenerationMobEffect.java +++ b/net/minecraft/world/effect/RegenerationMobEffect.java -@@ -11,7 +_,7 @@ +@@ -11,7 +11,7 @@ class RegenerationMobEffect extends MobEffect { @Override public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) { if (entity.getHealth() < entity.getMaxHealth()) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/SaturationMobEffect.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/SaturationMobEffect.java.patch similarity index 67% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/effect/SaturationMobEffect.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/SaturationMobEffect.java.patch index f2d21d380..c50201d8c 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/SaturationMobEffect.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/SaturationMobEffect.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/effect/SaturationMobEffect.java b/net/minecraft/world/effect/SaturationMobEffect.java +index c192165910f6b139df6f604d0bce989061efa9cb..622c23f4570d07de8bee9623bf900aabb3331ded 100644 --- a/net/minecraft/world/effect/SaturationMobEffect.java +++ b/net/minecraft/world/effect/SaturationMobEffect.java -@@ -16,7 +_,8 @@ +@@ -16,7 +16,8 @@ class SaturationMobEffect extends InstantenousMobEffect { int oldFoodLevel = player.getFoodData().foodLevel; org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, amplifier + 1 + oldFoodLevel); if (!event.isCancelled()) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/WitherMobEffect.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/WitherMobEffect.java.patch similarity index 51% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/effect/WitherMobEffect.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/WitherMobEffect.java.patch index 767637659..733c865ec 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/effect/WitherMobEffect.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/effect/WitherMobEffect.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/effect/WitherMobEffect.java b/net/minecraft/world/effect/WitherMobEffect.java +index 1fc9e1ad541c46124183a401b2a7d99aea69cecf..881271f0bc77a8a8a7d31daad9a8188bebaca67b 100644 --- a/net/minecraft/world/effect/WitherMobEffect.java +++ b/net/minecraft/world/effect/WitherMobEffect.java -@@ -12,7 +_,7 @@ +@@ -12,7 +12,7 @@ public class WitherMobEffect extends MobEffect { @Override public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/Entity.java.patch similarity index 82% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/Entity.java.patch index 878834bd9..9aee6d0c4 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/Entity.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java +index 8939cc4ab9612f132aec0a6d0175cc0d40de073e..96320494c8c738d86d33820c4acfb504291dc58c 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -150,6 +_,7 @@ +@@ -150,6 +150,7 @@ import org.jetbrains.annotations.Contract; import org.slf4j.Logger; public abstract class Entity implements SyncedDataHolder, DebugValueSource, Nameable, ItemOwner, EntityAccess, ScoreHolder, DataComponentGetter, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity, ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity { // Paper - rewrite chunk system // Paper - optimise entity tracker @@ -8,7 +16,7 @@ // CraftBukkit start private static final int CURRENT_LEVEL = 2; static boolean isLevelAtLeast(ValueInput input, int level) { -@@ -281,8 +_,9 @@ +@@ -281,8 +282,9 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name public double xOld; public double yOld; public double zOld; @@ -19,7 +27,7 @@ public int tickCount; private int remainingFireTicks; public boolean wasTouchingWater; -@@ -316,8 +_,8 @@ +@@ -316,8 +318,8 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name public PortalProcessor portalProcess; public int portalCooldown; private boolean invulnerable; @@ -30,7 +38,7 @@ private boolean hasGlowingTag; private final Set tags = new io.papermc.paper.util.SizeLimitedSet<>(new it.unimi.dsi.fastutil.objects.ObjectOpenHashSet<>(), MAX_ENTITY_TAG_COUNT); // Paper - fully limit tag size - replace set impl private final double[] pistonDeltas = new double[]{0.0, 0.0, 0.0}; -@@ -372,6 +_,7 @@ +@@ -372,6 +374,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name public long activatedTick = Integer.MIN_VALUE; public boolean isTemporarilyActive; public long activatedImmunityTick = Integer.MIN_VALUE; @@ -38,7 +46,7 @@ public void inactiveTick() { } -@@ -534,10 +_,21 @@ +@@ -534,10 +537,21 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name } // Paper end - optimise entity tracker @@ -60,7 +68,7 @@ this.position = Vec3.ZERO; this.blockPosition = BlockPos.ZERO; this.chunkPosition = ChunkPos.ZERO; -@@ -916,6 +_,7 @@ +@@ -916,6 +930,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v) && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) { // Paper end - Configurable nether ceiling damage @@ -68,7 +76,7 @@ this.onBelowWorld(); } } -@@ -1941,7 +_,7 @@ +@@ -1941,7 +1956,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name } public boolean fireImmune() { @@ -77,7 +85,7 @@ } public boolean causeFallDamage(double fallDistance, float damageMultiplier, DamageSource damageSource) { -@@ -2634,6 +_,11 @@ +@@ -2634,6 +2649,11 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name output.putBoolean("Paper.FreezeLock", true); } // Paper end @@ -89,7 +97,7 @@ } catch (Throwable var7) { CrashReport crashReport = CrashReport.forThrowable(var7, "Saving entity NBT"); CrashReportCategory crashReportCategory = crashReport.addCategory("Entity being saved"); -@@ -2754,6 +_,9 @@ +@@ -2754,6 +2774,9 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name } freezeLocked = input.getBooleanOr("Paper.FreezeLock", false); // Paper end @@ -99,7 +107,7 @@ } catch (Throwable var7) { CrashReport crashReport = CrashReport.forThrowable(var7, "Loading entity NBT"); CrashReportCategory crashReportCategory = crashReport.addCategory("Entity being loaded"); -@@ -3026,6 +_,7 @@ +@@ -3026,6 +3049,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name if (this.isAlive() && this instanceof Leashable leashable2) { if (leashable2.getLeashHolder() == player) { if (!this.level().isClientSide()) { @@ -107,7 +115,7 @@ // Paper start - EntityUnleashEvent if (!org.bukkit.craftbukkit.event.CraftEventFactory.handlePlayerUnleashEntityEvent( leashable2, player, hand, !player.hasInfiniteMaterials(), true -@@ -3450,15 +_,18 @@ +@@ -3450,15 +3474,18 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name return Vec3.directionFromRotation(this.getRotationVector()); } @@ -127,7 +135,7 @@ } } } -@@ -3663,7 +_,7 @@ +@@ -3663,7 +3690,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name } public int getMaxAirSupply() { @@ -136,7 +144,7 @@ } public int getAirSupply() { -@@ -4200,7 +_,7 @@ +@@ -4200,7 +4227,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name } public boolean canUsePortal(boolean allowPassengers) { @@ -145,7 +153,7 @@ } public boolean canTeleport(Level fromLevel, Level toLevel) { -@@ -4715,6 +_,12 @@ +@@ -4715,6 +4742,12 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name return Mth.lerp(partialTick, this.yRotO, this.yRot); } @@ -158,7 +166,7 @@ // Paper start - optimise collisions public boolean updateFluidHeightAndDoFluidPushing(final TagKey fluid, final double flowScale) { if (this.touchingUnloadedChunk()) { -@@ -5132,7 +_,7 @@ +@@ -5132,7 +5165,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name } public float maxUpStep() { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntitySelector.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/EntitySelector.java.patch similarity index 62% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntitySelector.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/EntitySelector.java.patch index ff1e039a1..1f7208817 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntitySelector.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/EntitySelector.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/EntitySelector.java b/net/minecraft/world/entity/EntitySelector.java +index 67d95236e135c2b44845cfd5cbfb7e553b8e31f2..b94b3a5aabd44b0158d535c7a4dc006e6f6f4689 100644 --- a/net/minecraft/world/entity/EntitySelector.java +++ b/net/minecraft/world/entity/EntitySelector.java -@@ -28,6 +_,8 @@ +@@ -28,6 +28,8 @@ public final class EntitySelector { return net.minecraft.util.Mth.clamp(serverPlayer.getStats().getValue(net.minecraft.stats.Stats.CUSTOM.get(net.minecraft.stats.Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= playerInsomniaTicks; }; // Paper end - Ability to control player's insomnia and phantoms diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntityType.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/EntityType.java.patch similarity index 72% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntityType.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/EntityType.java.patch index 1b4c119dd..c942a0387 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntityType.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/EntityType.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java +index 4af1d61a514c487b035f76ef4ae37536dc08ed67..d6f7d96dbdff908c91fbe43432313d2221b57afc 100644 --- a/net/minecraft/world/entity/EntityType.java +++ b/net/minecraft/world/entity/EntityType.java -@@ -1214,6 +_,16 @@ +@@ -1214,6 +1214,16 @@ public class EntityType implements FeatureElement, EntityTypeT return register(vanillaEntityId(key), builder); } @@ -17,7 +25,7 @@ public static ResourceLocation getKey(EntityType entityType) { return BuiltInRegistries.ENTITY_TYPE.getKey(entityType); } -@@ -1445,6 +_,16 @@ +@@ -1445,6 +1455,16 @@ public class EntityType implements FeatureElement, EntityTypeT return this.category; } @@ -34,7 +42,7 @@ public String getDescriptionId() { return this.descriptionId; } -@@ -1507,6 +_,7 @@ +@@ -1507,6 +1527,7 @@ public class EntityType implements FeatureElement, EntityTypeT // Paper start - Add logging for debugging entity tags with invalid ids () -> { LOGGER.warn("Skipping Entity with id {}", input.getStringOr("id", "[invalid]")); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ExperienceOrb.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ExperienceOrb.java.patch similarity index 77% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ExperienceOrb.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ExperienceOrb.java.patch index 46ae0daeb..f72ac4d88 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ExperienceOrb.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ExperienceOrb.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/ExperienceOrb.java b/net/minecraft/world/entity/ExperienceOrb.java +index 85c5a8497ee45de232a87c3f152e7ca67c1821ee..189488367329df837f4a98cda5af2c80d8847b96 100644 --- a/net/minecraft/world/entity/ExperienceOrb.java +++ b/net/minecraft/world/entity/ExperienceOrb.java -@@ -358,7 +_,7 @@ +@@ -358,7 +358,7 @@ public class ExperienceOrb extends Entity { public void playerTouch(Player entity) { if (entity instanceof ServerPlayer serverPlayer) { if (entity.takeXpDelay == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(serverPlayer.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper - PlayerPickupExperienceEvent @@ -9,7 +17,7 @@ entity.take(this, 1); int i = this.repairPlayerItems(serverPlayer, this.getValue()); if (i > 0) { -@@ -374,7 +_,7 @@ +@@ -374,7 +374,7 @@ public class ExperienceOrb extends Entity { } private int repairPlayerItems(ServerPlayer player, int value) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/GlowSquid.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/GlowSquid.java.patch similarity index 50% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/GlowSquid.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/GlowSquid.java.patch index 0eb1de991..3ec4fdadb 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/GlowSquid.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/GlowSquid.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/GlowSquid.java b/net/minecraft/world/entity/GlowSquid.java +index ae11fa15dc14f2b828cde4e3abfac330828c597e..70790f4e813bb950e103314644bd1d767edb4123 100644 --- a/net/minecraft/world/entity/GlowSquid.java +++ b/net/minecraft/world/entity/GlowSquid.java -@@ -27,6 +_,13 @@ +@@ -27,6 +27,13 @@ public class GlowSquid extends Squid { super(type, level); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/LivingEntity.java.patch similarity index 84% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/LivingEntity.java.patch index f98b9be3f..1883e92ac 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/LivingEntity.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java +index 6fa946c4ff8e1499a421e50d7e246bb669341d97..679073e7cd4e96a018b9bc6598b2c6fb385f1688 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java -@@ -447,6 +_,12 @@ +@@ -447,6 +447,12 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin if (d < 0.0) { double damagePerBlock = serverLevel1.getWorldBorder().getDamagePerBlock(); if (damagePerBlock > 0.0) { @@ -13,7 +21,7 @@ this.hurtServer(serverLevel1, this.damageSources().outOfBorder(), Math.max(1, Mth.floor(-d * damagePerBlock))); } } -@@ -462,7 +_,7 @@ +@@ -462,7 +468,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin if (this.shouldTakeDrowningDamage()) { this.setAirSupply(0); serverLevel1.broadcastEntityEvent(this, EntityEvent.DROWN_PARTICLES); @@ -22,7 +30,7 @@ } } else if (this.getAirSupply() < this.getMaxAirSupply()) { this.setAirSupply(this.increaseAirSupply(this.getAirSupply())); -@@ -522,7 +_,7 @@ +@@ -522,7 +528,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin } protected boolean shouldTakeDrowningDamage() { @@ -31,7 +39,7 @@ } @Override -@@ -1046,14 +_,32 @@ +@@ -1046,15 +1052,33 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin if (lookingEntity != null) { ItemStack itemBySlot = this.getItemBySlot(EquipmentSlot.HEAD); EntityType type = lookingEntity.getType(); @@ -41,15 +49,13 @@ - || type == EntityType.PIGLIN_BRUTE && itemBySlot.is(Items.PIGLIN_HEAD) - || type == EntityType.CREEPER && itemBySlot.is(Items.CREEPER_HEAD)) { - d *= 0.5; -- } -- } + // Purpur start - Mob head visibility percent + if (type == EntityType.SKELETON && itemBySlot.is(Items.SKELETON_SKULL)) { + d *= lookingEntity.level().purpurConfig.skeletonHeadVisibilityPercent; + } + else if (type == EntityType.ZOMBIE && itemBySlot.is(Items.ZOMBIE_HEAD)) { + d *= lookingEntity.level().purpurConfig.zombieHeadVisibilityPercent; -+ } + } + else if ((type == EntityType.PIGLIN || type == EntityType.PIGLIN_BRUTE) && itemBySlot.is(Items.PIGLIN_HEAD)) { + d *= lookingEntity.level().purpurConfig.piglinHeadVisibilityPercent; + } @@ -57,8 +63,8 @@ + d *= lookingEntity.level().purpurConfig.creeperHeadVisibilityPercent; + } + // Purpur end - Mob head visibility percent -+ } -+ + } + + // Purpur start - Configurable mob blindness + if (lookingEntity instanceof LivingEntity entityliving) { + if (entityliving.hasEffect(MobEffects.BLINDNESS)) { @@ -69,10 +75,11 @@ + } + } + // Purpur end - Configurable mob blindness - ++ return d; } -@@ -1100,6 +_,7 @@ + +@@ -1100,6 +1124,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin Iterator iterator = this.activeEffects.values().iterator(); while (iterator.hasNext()) { MobEffectInstance effect = iterator.next(); @@ -80,7 +87,7 @@ EntityPotionEffectEvent event = CraftEventFactory.callEntityPotionEffectChangeEvent(this, effect, null, cause, EntityPotionEffectEvent.Action.CLEARED); if (event.isCancelled()) { continue; -@@ -1424,6 +_,24 @@ +@@ -1424,6 +1449,24 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin this.stopSleeping(); } @@ -105,7 +112,7 @@ this.noActionTime = 0; if (amount < 0.0F) { amount = 0.0F; -@@ -1686,10 +_,10 @@ +@@ -1686,10 +1729,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin protected Player resolvePlayerResponsibleForDamage(DamageSource damageSource) { Entity entity = damageSource.getEntity(); if (entity instanceof Player player) { @@ -118,7 +125,7 @@ } else { this.lastHurtByPlayer = null; this.lastHurtByPlayerMemoryTime = 0; -@@ -1740,6 +_,18 @@ +@@ -1740,6 +1783,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin } } @@ -137,7 +144,7 @@ final org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null; final EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot); event.setCancelled(itemStack == null); -@@ -1921,6 +_,7 @@ +@@ -1921,6 +1976,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin boolean flag = this.lastHurtByPlayerMemoryTime > 0; this.dropEquipment(level); // CraftBukkit - from below if (this.shouldDropLoot(level)) { @@ -145,7 +152,7 @@ this.dropFromLootTable(level, damageSource, flag); // Paper start final boolean prev = this.clearEquipmentSlots; -@@ -1929,6 +_,7 @@ +@@ -1929,6 +1985,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin // Paper end this.dropCustomDeathLoot(level, damageSource, flag); this.clearEquipmentSlots = prev; // Paper @@ -153,7 +160,7 @@ } // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment -@@ -3149,6 +_,7 @@ +@@ -3149,6 +3206,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin float f = (float)(d * 10.0 - 3.0); if (f > 0.0F) { this.playSound(this.getFallDamageSound((int)f), 1.0F, 1.0F); @@ -161,16 +168,16 @@ this.hurt(this.damageSources().flyIntoWall(), f); } } -@@ -4548,6 +_,12 @@ - ? slot == EquipmentSlot.MAINHAND && this.canUseSlot(EquipmentSlot.MAINHAND) +@@ -4549,6 +4607,12 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin : slot == equippable.slot() && this.canUseSlot(equippable.slot()) && equippable.canBeEquippedBy(this.getType()); } -+ + + // Purpur start - Dispenser curse of binding protection + public @Nullable EquipmentSlot getEquipmentSlotForDispenserItem(ItemStack itemstack) { + return EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.BINDING_CURSE, itemstack) > 0 ? null : this.getEquipmentSlotForItem(itemstack); + } + // Purpur end - Dispenser curse of binding protection - ++ private static SlotAccess createEquipmentSlotAccess(LivingEntity entity, EquipmentSlot slot) { return slot != EquipmentSlot.HEAD && slot != EquipmentSlot.MAINHAND && slot != EquipmentSlot.OFFHAND + ? SlotAccess.forEquipmentSlot(entity, slot, itemStack -> itemStack.isEmpty() || entity.getEquipmentSlotForItem(itemStack) == slot) diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Mob.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/Mob.java.patch similarity index 72% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Mob.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/Mob.java.patch index a5a989368..b56ef8520 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Mob.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/Mob.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java +index f2a321d94ddc9247a3820d42f4a04290ea3ce6f6..7d98c5aaf29d2204ed43f221f95913ac749419db 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java -@@ -150,6 +_,7 @@ +@@ -150,6 +150,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab private int homeRadius = -1; public boolean aware = true; // CraftBukkit public net.kyori.adventure.util.TriState despawnInPeacefulOverride = net.kyori.adventure.util.TriState.NOT_SET; // Paper - allow changing despawnInPeaceful @@ -8,7 +16,7 @@ protected Mob(EntityType type, Level level) { super(type, level); -@@ -295,6 +_,7 @@ +@@ -295,6 +296,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab target = null; } } @@ -16,14 +24,13 @@ this.target = target; return true; // CraftBukkit end -@@ -338,7 +_,27 @@ +@@ -338,8 +340,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab } profilerFiller.pop(); -- } + incrementTicksSinceLastInteraction(); // Purpur - Entity lifespan -+ } -+ + } + + // Purpur start - Entity lifespan + private void incrementTicksSinceLastInteraction() { + ++this.ticksSinceLastInteraction; @@ -42,10 +49,11 @@ + } + } + // Purpur end - Entity lifespan - ++ @Override protected void playHurtSound(DamageSource damageSource) { -@@ -443,6 +_,7 @@ + this.resetAmbientSoundTime(); +@@ -443,6 +465,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab output.putString("Paper.DespawnInPeacefulOverride", this.despawnInPeacefulOverride.name()); } // Paper end - allow changing despawnInPeaceful @@ -53,7 +61,7 @@ } @Override -@@ -470,6 +_,7 @@ +@@ -470,6 +493,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab this.lootTableSeed = input.getLongOr("DeathLootTableSeed", 0L); this.setNoAi(input.getBooleanOr("NoAI", false)); this.aware = input.getBooleanOr("Bukkit.Aware", true); // CraftBukkit @@ -61,7 +69,7 @@ // Paper start - allow changing despawnInPeaceful this.despawnInPeacefulOverride = readDespawnInPeacefulOverride(input); } -@@ -1210,7 +_,7 @@ +@@ -1210,7 +1234,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab ); } @@ -70,7 +78,7 @@ return spawnGroupData; } -@@ -1557,6 +_,7 @@ +@@ -1557,6 +1581,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab this.playAttackSound(); } diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/attributes/RangedAttribute.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/attributes/RangedAttribute.java.patch new file mode 100644 index 000000000..3627cbcbb --- /dev/null +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/attributes/RangedAttribute.java.patch @@ -0,0 +1,18 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/ai/attributes/RangedAttribute.java b/net/minecraft/world/entity/ai/attributes/RangedAttribute.java +index 0a0e5d9fd64182c1bed4c0aa6a40d8b2cdf8bc9d..353d571b4a2bf18414a08239abe2b079e3750d89 100644 +--- a/net/minecraft/world/entity/ai/attributes/RangedAttribute.java ++++ b/net/minecraft/world/entity/ai/attributes/RangedAttribute.java +@@ -29,6 +29,7 @@ public class RangedAttribute extends Attribute { + + @Override + public double sanitizeValue(double value) { ++ if (!org.purpurmc.purpur.PurpurConfig.clampAttributes) return Double.isNaN(value) ? this.minValue : value; // Purpur - Add attribute clamping and armor limit config + return Double.isNaN(value) ? this.minValue : Mth.clamp(value, this.minValue, this.maxValue); + } + } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/AcquirePoi.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/behavior/AcquirePoi.java.patch similarity index 73% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/AcquirePoi.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/behavior/AcquirePoi.java.patch index f499d70f9..79674b0cf 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/AcquirePoi.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/behavior/AcquirePoi.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/net/minecraft/world/entity/ai/behavior/AcquirePoi.java +index ffc960a4e66ed03a358b363a4ce1dcee0b29ac36..21046cde1bd1ede8e7851eb4ea414e33628aa4a9 100644 --- a/net/minecraft/world/entity/ai/behavior/AcquirePoi.java +++ b/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -@@ -85,7 +_,7 @@ +@@ -85,7 +85,7 @@ public class AcquirePoi { }; // Paper start - optimise POI access final java.util.List, BlockPos>> poiposes = new java.util.ArrayList<>(); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java.patch similarity index 80% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java.patch index f90e63ebd..41381f246 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java b/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java +index 296ecffbbce931b42c67ea523373a61cea23acf4..b2eec24be3635f2c19da9b147211fe6cb454c780 100644 --- a/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java +++ b/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java -@@ -55,7 +_,7 @@ +@@ -55,7 +55,7 @@ public class InteractWithDoor { Node nextNode = path.getNextNode(); BlockPos blockPos = previousNode.asBlockPos(); BlockState blockState = level.getBlockState(blockPos); @@ -9,7 +17,7 @@ DoorBlock doorBlock = (DoorBlock)blockState.getBlock(); if (!doorBlock.isOpen(blockState)) { // CraftBukkit start - entities opening doors -@@ -72,7 +_,7 @@ +@@ -72,7 +72,7 @@ public class InteractWithDoor { BlockPos blockPos1 = nextNode.asBlockPos(); BlockState blockState1 = level.getBlockState(blockPos1); @@ -18,7 +26,7 @@ DoorBlock doorBlock1 = (DoorBlock)blockState1.getBlock(); if (!doorBlock1.isOpen(blockState1)) { // CraftBukkit start - entities opening doors -@@ -118,7 +_,7 @@ +@@ -118,7 +118,7 @@ public class InteractWithDoor { iterator.remove(); } else { BlockState blockState = level.getBlockState(blockPos); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java.patch similarity index 52% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java.patch index 2bbc2776e..821662a32 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java b/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java +index 400e6d49144b3e5803901938dcd2ac4e52e9c131..45c45afeffcfba3558bdf46cbe39ff60004ffc01 100644 --- a/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java +++ b/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java -@@ -46,6 +_,7 @@ +@@ -46,6 +46,7 @@ public class ShowTradesToPlayer extends Behavior { @Override public boolean canStillUse(ServerLevel level, Villager entity, long gameTime) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/TransportItemsBetweenContainers.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/behavior/TransportItemsBetweenContainers.java.patch similarity index 78% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/TransportItemsBetweenContainers.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/behavior/TransportItemsBetweenContainers.java.patch index 6fb3129f7..935cfc81d 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/TransportItemsBetweenContainers.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/behavior/TransportItemsBetweenContainers.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/ai/behavior/TransportItemsBetweenContainers.java b/net/minecraft/world/entity/ai/behavior/TransportItemsBetweenContainers.java +index 6d815c3c28b76b1001ad197c6bb1f64620bb32fe..1408aaad39eb72996ea9e3ad6de217407e63d204 100644 --- a/net/minecraft/world/entity/ai/behavior/TransportItemsBetweenContainers.java +++ b/net/minecraft/world/entity/ai/behavior/TransportItemsBetweenContainers.java -@@ -287,7 +_,7 @@ +@@ -287,7 +287,7 @@ public class TransportItemsBetweenContainers extends Behavior { LevelChunk chunkNow = level.getChunkSource().getChunkNow(chunkPos.x, chunkPos.z); if (chunkNow != null) { for (BlockEntity blockEntity : chunkNow.getBlockEntities().values()) { @@ -9,7 +17,7 @@ double d1 = chestBlockEntity.getBlockPos().distToCenterSqr(mob.position()); if (d1 < d) { TransportItemsBetweenContainers.TransportItemTarget transportItemTarget1 = this.isTargetValidToPick( -@@ -372,7 +_,11 @@ +@@ -372,7 +372,11 @@ public class TransportItemsBetweenContainers extends Behavior { } private boolean isTargetBlocked(Level level, TransportItemsBetweenContainers.TransportItemTarget target) { @@ -22,7 +30,7 @@ } private boolean targetHasNotChanged(Level level, TransportItemsBetweenContainers.TransportItemTarget target) { -@@ -449,7 +_,7 @@ +@@ -449,7 +453,7 @@ public class TransportItemsBetweenContainers extends Behavior { } private boolean isWantedBlock(PathfinderMob mob, BlockState state) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java.patch similarity index 63% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java.patch index 6fbb7bf98..d7ad080be 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java b/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java +index 6eaf0bd944349cd0c6084462ac385fa2caafe933..be59d0c27a83b329ec3f97c029cfb9c114e22472 100644 --- a/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java +++ b/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java -@@ -22,6 +_,7 @@ +@@ -22,6 +22,7 @@ public class LlamaFollowCaravanGoal extends Goal { @Override public boolean canUse() { @@ -8,7 +16,7 @@ if (!this.llama.isLeashed() && !this.llama.inCaravan()) { List entities = this.llama.level().getEntities(this.llama, this.llama.getBoundingBox().inflate(9.0, 4.0, 9.0), entity1 -> { EntityType type = entity1.getType(); -@@ -71,6 +_,7 @@ +@@ -71,6 +72,7 @@ public class LlamaFollowCaravanGoal extends Goal { @Override public boolean canContinueToUse() { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java.patch similarity index 53% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java.patch index f623c03a9..34796860d 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java b/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java +index 722f378bb3726200b6fe88948bf1e1d3514a7b5c..e337e22c2cf82b0c1cab3fe0a9ff894c0c718716 100644 --- a/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java +++ b/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java -@@ -116,9 +_,9 @@ +@@ -116,9 +116,9 @@ public class RangedBowAttackGoal extends Go } this.mob.lookAt(target, 30.0F, 30.0F); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java.patch similarity index 71% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java.patch index dbec726c4..5802987ca 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java b/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java +index ffa69c974320279ec31b17e66bfab52c3e194e1b..800f8eb0066a83324abac5998848f99f7e45529d 100644 --- a/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java +++ b/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java -@@ -59,7 +_,7 @@ +@@ -59,7 +59,7 @@ public class RunAroundLikeCrazyGoal extends Goal { if (firstPassenger instanceof Player player) { int temper = this.horse.getTemper(); int maxTemper = this.horse.getMaxTemper(); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/SwellGoal.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/goal/SwellGoal.java.patch similarity index 66% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/SwellGoal.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/goal/SwellGoal.java.patch index b072c14f4..b460e31db 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/SwellGoal.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/goal/SwellGoal.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/ai/goal/SwellGoal.java b/net/minecraft/world/entity/ai/goal/SwellGoal.java +index 243a552f6f0c8c2bd25c0209c95e3bca08734711..38fd0196a0f5a90e39fa4eb8592f89bf6b88ccf5 100644 --- a/net/minecraft/world/entity/ai/goal/SwellGoal.java +++ b/net/minecraft/world/entity/ai/goal/SwellGoal.java -@@ -55,6 +_,14 @@ +@@ -55,6 +55,14 @@ public class SwellGoal extends Goal { this.creeper.setSwellDir(-1); } else { this.creeper.setSwellDir(1); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java.patch similarity index 68% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java.patch index 7e2366a32..b6cf53485 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java b/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java +index 066faa704338c573472381e1ebd063e0d52aaaa4..1f96fd5085bacb4c584576c7cb9f51e7898e9b03 100644 --- a/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java +++ b/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java -@@ -56,7 +_,7 @@ +@@ -56,7 +56,7 @@ public class NearestBedSensor extends Sensor { // Paper start - optimise POI access java.util.List, BlockPos>> poiposes = new java.util.ArrayList<>(); // don't ask me why it's unbounded. ask mojang. diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/targeting/TargetingConditions.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/targeting/TargetingConditions.java.patch similarity index 59% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/targeting/TargetingConditions.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/targeting/TargetingConditions.java.patch index df5fd519b..ca1f45424 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/targeting/TargetingConditions.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ai/targeting/TargetingConditions.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/net/minecraft/world/entity/ai/targeting/TargetingConditions.java +index 8e536b1029b1e8f134c316f49df5d76d154d125a..95ad69396d740fbd1b990c6a1382a6e22065dea4 100644 --- a/net/minecraft/world/entity/ai/targeting/TargetingConditions.java +++ b/net/minecraft/world/entity/ai/targeting/TargetingConditions.java -@@ -64,6 +_,10 @@ +@@ -64,6 +64,10 @@ public class TargetingConditions { return false; } else if (this.selector != null && !this.selector.test(target, level)) { return false; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ambient/Bat.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ambient/Bat.java.patch similarity index 61% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ambient/Bat.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ambient/Bat.java.patch index 083b7154f..c0d5bf84f 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ambient/Bat.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/ambient/Bat.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/ambient/Bat.java b/net/minecraft/world/entity/ambient/Bat.java +index c0198c0b6d00667c9591a5cd254b0bfedc3fb627..acb402027bbb16a1b590415b2358cf03147119c0 100644 --- a/net/minecraft/world/entity/ambient/Bat.java +++ b/net/minecraft/world/entity/ambient/Bat.java -@@ -234,7 +_,7 @@ +@@ -234,7 +234,7 @@ public class Bat extends AmbientCreature { } else { int maxLocalRawBrightness = level.getMaxLocalRawBrightness(pos); int i = 4; @@ -9,7 +17,7 @@ i = 7; } else if (randomSource.nextBoolean()) { return false; -@@ -246,6 +_,7 @@ +@@ -246,6 +246,7 @@ public class Bat extends AmbientCreature { } } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/AbstractCow.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/AbstractCow.java.patch similarity index 89% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/AbstractCow.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/AbstractCow.java.patch index 3c0826a05..c115fdc82 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/AbstractCow.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/AbstractCow.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/AbstractCow.java b/net/minecraft/world/entity/animal/AbstractCow.java +index 1bedc350a6625adc12359d9c9290a01e44fa638f..439d0dfabf9263bfbfb727b87dba17e848f6e66c 100644 --- a/net/minecraft/world/entity/animal/AbstractCow.java +++ b/net/minecraft/world/entity/animal/AbstractCow.java -@@ -39,7 +_,7 @@ +@@ -39,7 +39,7 @@ public abstract class AbstractCow extends Animal { this.goalSelector.addGoal(0, new FloatGoal(this)); this.goalSelector.addGoal(1, new PanicGoal(this, 2.0)); this.goalSelector.addGoal(2, new BreedGoal(this, 1.0)); @@ -9,7 +17,7 @@ this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.25)); this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 1.0)); this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F)); -@@ -95,6 +_,10 @@ +@@ -95,6 +95,10 @@ public abstract class AbstractCow extends Animal { ItemStack itemStack = ItemUtils.createFilledResult(itemInHand, player, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getItemStack())); // CraftBukkit player.setItemInHand(hand, itemStack); return InteractionResult.SUCCESS; @@ -20,7 +28,7 @@ } else { return super.mobInteract(player, hand); } -@@ -104,4 +_,67 @@ +@@ -104,4 +108,67 @@ public abstract class AbstractCow extends Animal { public EntityDimensions getDefaultDimensions(Pose pose) { return this.isBaby() ? BABY_DIMENSIONS : super.getDefaultDimensions(pose); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Animal.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Animal.java.patch similarity index 83% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Animal.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Animal.java.patch index 1732e9e64..c3a83c48e 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Animal.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Animal.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/Animal.java b/net/minecraft/world/entity/animal/Animal.java +index 384cf7e65cf6a802ba58d5327e971ac033e23962..8ccab236d1b8b00485eb6608778c43c5581641bd 100644 --- a/net/minecraft/world/entity/animal/Animal.java +++ b/net/minecraft/world/entity/animal/Animal.java -@@ -142,7 +_,7 @@ +@@ -142,7 +142,7 @@ public abstract class Animal extends AgeableMob { ItemStack itemInHand = player.getItemInHand(hand); if (this.isFood(itemInHand)) { int age = this.getAge(); @@ -9,7 +17,7 @@ final ItemStack breedCopy = itemInHand.copy(); // Paper - Fix EntityBreedEvent copying this.usePlayerItem(player, hand, itemInHand); this.setInLove(serverPlayer, breedCopy); // Paper - Fix EntityBreedEvent copying -@@ -224,10 +_,20 @@ +@@ -224,10 +224,20 @@ public abstract class Animal extends AgeableMob { public void spawnChildFromBreeding(ServerLevel level, Animal partner) { AgeableMob breedOffspring = this.getBreedOffspring(level, partner); if (breedOffspring != null) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Bee.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Bee.java.patch similarity index 79% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Bee.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Bee.java.patch index 28b494c1d..0d4adc4fd 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Bee.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Bee.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/Bee.java b/net/minecraft/world/entity/animal/Bee.java +index e94c6c1ee969a7d0953b933fb0633cebb510a68c..3988a8e8ba319e5e80a9fba916b62bdb4996e08f 100644 --- a/net/minecraft/world/entity/animal/Bee.java +++ b/net/minecraft/world/entity/animal/Bee.java -@@ -171,7 +_,7 @@ +@@ -171,7 +171,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { // Paper end - Fix MC-167279 this.lookControl = new Bee.BeeLookControl(this); this.setPathfindingMalus(PathType.DANGER_FIRE, -1.0F); @@ -9,7 +17,7 @@ this.setPathfindingMalus(PathType.WATER_BORDER, 16.0F); this.setPathfindingMalus(PathType.COCOA, -1.0F); this.setPathfindingMalus(PathType.FENCE, -1.0F); -@@ -367,7 +_,7 @@ +@@ -367,7 +367,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } public static boolean isNightOrRaining(Level level) { @@ -18,7 +26,7 @@ } public void setStayOutOfHiveCountdown(int stayOutOfHiveCountdown) { -@@ -390,7 +_,7 @@ +@@ -390,7 +390,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { @Override protected void customServerAiStep(ServerLevel level) { boolean hasStung = this.hasStung(); @@ -27,7 +35,7 @@ this.underWaterTicks++; } else { this.underWaterTicks = 0; -@@ -400,6 +_,7 @@ +@@ -400,6 +400,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { this.hurtServer(level, this.damageSources().drown(), 1.0F); } @@ -35,7 +43,7 @@ if (hasStung) { this.timeSinceSting++; if (this.timeSinceSting % 5 == 0 && this.random.nextInt(Mth.clamp(1200 - this.timeSinceSting, 1, 1200)) == 0) { -@@ -1139,6 +_,7 @@ +@@ -1139,6 +1140,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { Bee.this.savedFlowerPos = optional.get(); Bee.this.navigation .moveTo(Bee.this.savedFlowerPos.getX() + 0.5, Bee.this.savedFlowerPos.getY() + 0.5, Bee.this.savedFlowerPos.getZ() + 0.5, 1.2F); @@ -43,7 +51,7 @@ return true; } else { Bee.this.remainingCooldownBeforeLocatingNewFlower = Mth.nextInt(Bee.this.random, 20, 60); -@@ -1185,6 +_,7 @@ +@@ -1185,6 +1187,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { this.pollinating = false; Bee.this.navigation.stop(); Bee.this.remainingCooldownBeforeLocatingNewFlower = 200; @@ -51,7 +59,7 @@ } @Override -@@ -1231,6 +_,7 @@ +@@ -1231,6 +1234,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { this.setWantedPos(); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Cat.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Cat.java.patch similarity index 70% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Cat.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Cat.java.patch index 6c4050386..a1cd244ca 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Cat.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Cat.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/Cat.java b/net/minecraft/world/entity/animal/Cat.java +index e1f12787a83458fd51dae6a907bbb81e3e522254..f6912836026638900fa5929b9550386a004fef11 100644 --- a/net/minecraft/world/entity/animal/Cat.java +++ b/net/minecraft/world/entity/animal/Cat.java -@@ -355,6 +_,14 @@ +@@ -355,6 +355,14 @@ public class Cat extends TamableAnimal { return this.isTame() && otherAnimal instanceof Cat cat && cat.isTame() && super.canMate(otherAnimal); } @@ -15,7 +23,7 @@ @Nullable @Override public SpawnGroupData finalizeSpawn( -@@ -453,7 +_,7 @@ +@@ -453,7 +461,7 @@ public class Cat extends TamableAnimal { } private void tryToTame(Player player) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Dolphin.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Dolphin.java.patch similarity index 81% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Dolphin.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Dolphin.java.patch index 6bf7cb62c..90a3cdd01 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Dolphin.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Dolphin.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/Dolphin.java b/net/minecraft/world/entity/animal/Dolphin.java +index 91ee1423557d7287de9f4adc8376b0b7ee8c94ac..487a0e850d1d4f4c2e9c1175708712146f809a68 100644 --- a/net/minecraft/world/entity/animal/Dolphin.java +++ b/net/minecraft/world/entity/animal/Dolphin.java -@@ -75,6 +_,7 @@ +@@ -75,6 +75,7 @@ public class Dolphin extends AgeableWaterCreature { private static final boolean DEFAULT_GOT_FISH = false; @Nullable public BlockPos treasurePos; @@ -8,7 +16,7 @@ public Dolphin(EntityType type, Level level) { super(type, level); -@@ -91,6 +_,7 @@ +@@ -91,6 +92,7 @@ public class Dolphin extends AgeableWaterCreature { this.setAirSupply(this.getMaxAirSupply()); this.setXRot(0.0F); SpawnGroupData spawnGroupData1 = Objects.requireNonNullElseGet(spawnGroupData, () -> new AgeableMob.AgeableMobGroupData(0.1F)); @@ -16,7 +24,7 @@ return super.finalizeSpawn(level, difficulty, spawnReason, spawnGroupData1); } -@@ -157,17 +_,19 @@ +@@ -157,17 +159,19 @@ public class Dolphin extends AgeableWaterCreature { protected void registerGoals() { this.goalSelector.addGoal(0, new BreathAirGoal(this)); this.goalSelector.addGoal(0, new TryFindWaterGoal(this)); @@ -37,7 +45,7 @@ } public static AttributeSupplier.Builder createAttributes() { -@@ -400,6 +_,7 @@ +@@ -400,6 +404,7 @@ public class Dolphin extends AgeableWaterCreature { @Override public boolean canUse() { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Fox.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Fox.java.patch similarity index 75% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Fox.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Fox.java.patch index df0a11421..a96a4188a 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Fox.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Fox.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/Fox.java b/net/minecraft/world/entity/animal/Fox.java +index 849ae9efc0d1e01ff1be36cc873e69530ea30691..30a781b28fc4c78ca581fba405fae66f5b72251e 100644 --- a/net/minecraft/world/entity/animal/Fox.java +++ b/net/minecraft/world/entity/animal/Fox.java -@@ -348,6 +_,11 @@ +@@ -348,6 +348,11 @@ public class Fox extends Animal { } private void setTargetGoals() { @@ -12,7 +20,7 @@ if (this.getVariant() == Fox.Variant.RED) { this.targetSelector.addGoal(4, this.landTargetGoal); this.targetSelector.addGoal(4, this.turtleEggTargetGoal); -@@ -375,6 +_,7 @@ +@@ -375,6 +380,7 @@ public class Fox extends Animal { public void setVariant(Fox.Variant variant) { this.entityData.set(DATA_TYPE_ID, variant.getId()); @@ -20,11 +28,10 @@ } @Nullable -@@ -704,6 +_,29 @@ - return slot == EquipmentSlot.MAINHAND; +@@ -705,6 +711,29 @@ public class Fox extends Animal { } // Paper end -+ + + // Purpur start - Tulips change fox type + @Override + public net.minecraft.world.InteractionResult mobInteract(Player player, net.minecraft.world.InteractionHand hand) { @@ -47,6 +54,7 @@ + return super.mobInteract(player, hand); + } + // Purpur end - Tulips change fox type - ++ @Override // Paper start - Cancellable death event + protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(ServerLevel level, DamageSource damageSource) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/IronGolem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/IronGolem.java.patch similarity index 75% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/IronGolem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/IronGolem.java.patch index 349d0b8d9..05fede9e2 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/IronGolem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/IronGolem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/IronGolem.java b/net/minecraft/world/entity/animal/IronGolem.java +index 6ba3d1f1019af2b2dde3804635a278e8d2c33dc8..838cc49d1a8b1b9758121c07de9e483966eef245 100644 --- a/net/minecraft/world/entity/animal/IronGolem.java +++ b/net/minecraft/world/entity/animal/IronGolem.java -@@ -59,13 +_,26 @@ +@@ -59,13 +59,26 @@ public class IronGolem extends AbstractGolem implements NeutralMob { private int remainingPersistentAngerTime; @Nullable private UUID persistentAngerTarget; @@ -27,7 +35,7 @@ this.goalSelector.addGoal(1, new MeleeAttackGoal(this, 1.0, true)); this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9, 32.0F)); this.goalSelector.addGoal(2, new MoveBackToVillageGoal(this, 0.6, false)); -@@ -143,6 +_,7 @@ +@@ -143,6 +156,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob { protected void addAdditionalSaveData(ValueOutput output) { super.addAdditionalSaveData(output); output.putBoolean("PlayerCreated", this.isPlayerCreated()); @@ -35,7 +43,7 @@ this.addPersistentAngerSaveData(output); } -@@ -150,6 +_,7 @@ +@@ -150,6 +164,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob { protected void readAdditionalSaveData(ValueInput input) { super.readAdditionalSaveData(input); this.setPlayerCreated(input.getBooleanOr("PlayerCreated", false)); @@ -43,7 +51,7 @@ this.readPersistentAngerSaveData(this.level(), input); } -@@ -269,6 +_,7 @@ +@@ -269,6 +284,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob { float f = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F; this.playSound(SoundEvents.IRON_GOLEM_REPAIR, 1.0F, f); itemInHand.consume(1, player); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/MushroomCow.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/MushroomCow.java.patch similarity index 67% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/MushroomCow.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/MushroomCow.java.patch index 0d13e703a..618242477 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/MushroomCow.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/MushroomCow.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/MushroomCow.java b/net/minecraft/world/entity/animal/MushroomCow.java +index 7b4f76ae8907ae45cb0ac6fa397a319ab3cc2a22..3ce300a6abc4ee39f010ff5318b64c50e732742b 100644 --- a/net/minecraft/world/entity/animal/MushroomCow.java +++ b/net/minecraft/world/entity/animal/MushroomCow.java -@@ -201,6 +_,13 @@ +@@ -201,6 +201,13 @@ public class MushroomCow extends AbstractCow implements Shearable { level.playSound(null, this, SoundEvents.MOOSHROOM_SHEAR, source, 1.0F, 1.0F); this.convertTo(EntityType.COW, ConversionParams.single(this, false, false), cow -> { level.sendParticles(ParticleTypes.EXPLOSION, this.getX(), this.getY(0.5), this.getZ(), 1, 0.0, 0.0, 0.0, 0.0); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Ocelot.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Ocelot.java.patch similarity index 56% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Ocelot.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Ocelot.java.patch index 8770edae2..6cbd963e0 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Ocelot.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Ocelot.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/Ocelot.java b/net/minecraft/world/entity/animal/Ocelot.java +index 4c4760a5b3242a83e88cedb192b1309e5fb29ee2..ae93426d4bd7f82c3beb90b2c7a957ccbf24ddd7 100644 --- a/net/minecraft/world/entity/animal/Ocelot.java +++ b/net/minecraft/world/entity/animal/Ocelot.java -@@ -235,7 +_,7 @@ +@@ -235,7 +235,7 @@ public class Ocelot extends Animal { public boolean checkSpawnObstruction(LevelReader level) { if (level.isUnobstructed(this) && !level.containsAnyLiquid(this.getBoundingBox())) { BlockPos blockPos = this.blockPosition(); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Parrot.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Parrot.java.patch similarity index 74% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Parrot.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Parrot.java.patch index 6bdb9d04c..bc4e5e291 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Parrot.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Parrot.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/Parrot.java b/net/minecraft/world/entity/animal/Parrot.java +index 55d66e13d74f0ed3b4260b806eae03c0ef5053da..f5bd84355cd57b7a8c3ccd0f9ed2f714ff21233b 100644 --- a/net/minecraft/world/entity/animal/Parrot.java +++ b/net/minecraft/world/entity/animal/Parrot.java -@@ -160,6 +_,7 @@ +@@ -160,6 +160,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal { protected void registerGoals() { this.goalSelector.addGoal(0, new TamableAnimal.TamableAnimalPanicGoal(1.25)); this.goalSelector.addGoal(0, new FloatGoal(this)); @@ -8,7 +16,7 @@ this.goalSelector.addGoal(1, new LookAtPlayerGoal(this, Player.class, 8.0F)); this.goalSelector.addGoal(2, new SitWhenOrderedToGoal(this)); this.goalSelector.addGoal(2, new FollowOwnerGoal(this, 1.0, 5.0F, 1.0F)); -@@ -265,7 +_,7 @@ +@@ -265,7 +266,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal { } if (!this.level().isClientSide()) { @@ -17,7 +25,7 @@ this.tame(player); this.level().broadcastEntityEvent(this, EntityEvent.TAMING_SUCCEEDED); } else { -@@ -273,6 +_,7 @@ +@@ -273,6 +274,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal { } } @@ -25,7 +33,7 @@ return InteractionResult.SUCCESS; } else if (!itemInHand.is(ItemTags.PARROT_POISONOUS_FOOD)) { if (!this.isFlying() && this.isTame() && this.isOwnedBy(player)) { -@@ -297,7 +_,7 @@ +@@ -297,7 +299,7 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal { @Override public boolean isFood(ItemStack stack) { @@ -34,7 +42,7 @@ } public static boolean checkParrotSpawnRules( -@@ -312,13 +_,13 @@ +@@ -312,13 +314,13 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal { @Override public boolean canMate(Animal otherAnimal) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Pig.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Pig.java.patch similarity index 69% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Pig.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Pig.java.patch index ac4f4d082..3092a7d98 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Pig.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Pig.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/Pig.java b/net/minecraft/world/entity/animal/Pig.java +index bbb1b6033c7e742cf1cdf35fdce0dc127aa37756..8a12ac29e2221c7e91f4935046894fbc77eaf2a1 100644 --- a/net/minecraft/world/entity/animal/Pig.java +++ b/net/minecraft/world/entity/animal/Pig.java -@@ -142,6 +_,19 @@ +@@ -142,6 +142,19 @@ public class Pig extends Animal implements ItemSteerable { @Override public InteractionResult mobInteract(Player player, InteractionHand hand) { boolean isFood = this.isFood(player.getItemInHand(hand)); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/PolarBear.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/PolarBear.java.patch similarity index 78% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/PolarBear.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/PolarBear.java.patch index ddfcd11a4..8614c56fe 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/PolarBear.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/PolarBear.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/PolarBear.java b/net/minecraft/world/entity/animal/PolarBear.java +index 3365988779494860e3248487ed3e9f7c16848a7b..59288cb00951808d3ea7921875c9cbecb2de7f98 100644 --- a/net/minecraft/world/entity/animal/PolarBear.java +++ b/net/minecraft/world/entity/animal/PolarBear.java -@@ -65,6 +_,29 @@ +@@ -65,6 +65,29 @@ public class PolarBear extends Animal implements NeutralMob { super(type, level); } @@ -30,7 +38,7 @@ @Nullable @Override public AgeableMob getBreedOffspring(ServerLevel level, AgeableMob partner) { -@@ -73,7 +_,7 @@ +@@ -73,7 +96,7 @@ public class PolarBear extends Animal implements NeutralMob { @Override public boolean isFood(ItemStack stack) { @@ -39,7 +47,7 @@ } @Override -@@ -82,6 +_,12 @@ +@@ -82,6 +105,12 @@ public class PolarBear extends Animal implements NeutralMob { this.goalSelector.addGoal(0, new FloatGoal(this)); this.goalSelector.addGoal(1, new PolarBear.PolarBearMeleeAttackGoal()); this.goalSelector.addGoal(1, new PanicGoal(this, 2.0, mob -> mob.isBaby() ? DamageTypeTags.PANIC_CAUSES : DamageTypeTags.PANIC_ENVIRONMENTAL_CAUSES)); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Rabbit.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Rabbit.java.patch similarity index 73% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Rabbit.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Rabbit.java.patch index ffcca1991..b798c6422 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Rabbit.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Rabbit.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/Rabbit.java b/net/minecraft/world/entity/animal/Rabbit.java +index 94aaae063defb56461351887b4a3023a62e4ce24..aa5bca6c0633cffdbb79ecc50d68e5c4bc2e54cf 100644 --- a/net/minecraft/world/entity/animal/Rabbit.java +++ b/net/minecraft/world/entity/animal/Rabbit.java -@@ -406,10 +_,23 @@ +@@ -406,10 +406,23 @@ public class Rabbit extends Animal { } this.setVariant(randomRabbitVariant); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/SnowGolem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/SnowGolem.java.patch similarity index 80% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/SnowGolem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/SnowGolem.java.patch index d25fc3092..a62a2c9a7 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/SnowGolem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/SnowGolem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/SnowGolem.java b/net/minecraft/world/entity/animal/SnowGolem.java +index 1029f3342e8ba5754d99bd20106aaa30bca5ab19..8fa983d168874ef1497dc38b673295eb76a4e8b4 100644 --- a/net/minecraft/world/entity/animal/SnowGolem.java +++ b/net/minecraft/world/entity/animal/SnowGolem.java -@@ -46,15 +_,27 @@ +@@ -46,15 +46,27 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM private static final EntityDataAccessor DATA_PUMPKIN_ID = SynchedEntityData.defineId(SnowGolem.class, EntityDataSerializers.BYTE); private static final byte PUMPKIN_FLAG = 16; private static final boolean DEFAULT_PUMPKIN = true; @@ -30,7 +38,7 @@ this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F)); this.goalSelector.addGoal(4, new RandomLookAroundGoal(this)); this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Mob.class, 10, true, false, (entity, level) -> entity instanceof Enemy)); -@@ -74,12 +_,14 @@ +@@ -74,12 +86,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM protected void addAdditionalSaveData(ValueOutput output) { super.addAdditionalSaveData(output); output.putBoolean("Pumpkin", this.hasPumpkin()); @@ -45,7 +53,7 @@ } @Override -@@ -153,6 +_,14 @@ +@@ -153,6 +167,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM } return InteractionResult.SUCCESS; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Squid.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Squid.java.patch similarity index 80% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Squid.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Squid.java.patch index 0a0742185..74313c753 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Squid.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/Squid.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/Squid.java b/net/minecraft/world/entity/animal/Squid.java +index 8313ea146ba6910d92653c29887c94b75f68cce4..1f63894c82f39e43a25b9900f8f92f83cc5b6e66 100644 --- a/net/minecraft/world/entity/animal/Squid.java +++ b/net/minecraft/world/entity/animal/Squid.java -@@ -47,10 +_,29 @@ +@@ -47,10 +47,29 @@ public class Squid extends AgeableWaterCreature { public Squid(EntityType type, Level level) { super(type, level); @@ -31,7 +39,7 @@ @Override protected void registerGoals() { this.goalSelector.addGoal(0, new Squid.SquidRandomMovementGoal(this)); -@@ -128,6 +_,7 @@ +@@ -128,6 +147,7 @@ public class Squid extends AgeableWaterCreature { } if (this.isInWater()) { @@ -39,7 +47,7 @@ if (this.tentacleMovement < (float) Math.PI) { float f = this.tentacleMovement / (float) Math.PI; this.tentacleAngle = Mth.sin(f * f * (float) Math.PI) * (float) Math.PI * 0.25F; -@@ -309,7 +_,7 @@ +@@ -309,7 +329,7 @@ public class Squid extends AgeableWaterCreature { int noActionTime = this.squid.getNoActionTime(); if (noActionTime > 100) { this.squid.movementVector = Vec3.ZERO; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/WaterAnimal.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/WaterAnimal.java.patch similarity index 64% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/WaterAnimal.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/WaterAnimal.java.patch index 3552d2bfc..46ed3ef48 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/WaterAnimal.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/WaterAnimal.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/WaterAnimal.java b/net/minecraft/world/entity/animal/WaterAnimal.java +index b299512f2c495769c07f0fa911eed546b28cab9b..792221566b3ade7e55405a13e0877445445d97b5 100644 --- a/net/minecraft/world/entity/animal/WaterAnimal.java +++ b/net/minecraft/world/entity/animal/WaterAnimal.java -@@ -76,8 +_,7 @@ +@@ -76,8 +76,7 @@ public abstract class WaterAnimal extends PathfinderMob { seaLevel = level.getMinecraftWorld().paperConfig().entities.spawning.wateranimalSpawnHeight.maximum.or(seaLevel); i = level.getMinecraftWorld().paperConfig().entities.spawning.wateranimalSpawnHeight.minimum.or(i); // Paper end - Make water animal spawn height configurable diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/coppergolem/CopperGolem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/coppergolem/CopperGolem.java.patch similarity index 70% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/coppergolem/CopperGolem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/coppergolem/CopperGolem.java.patch index 488d40186..21d01e818 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/coppergolem/CopperGolem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/coppergolem/CopperGolem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/coppergolem/CopperGolem.java b/net/minecraft/world/entity/animal/coppergolem/CopperGolem.java +index f16a4c8b568603d26e05d028f6f2f08822f2f045..9de4727596b2fde69f4049734eee0f1d81079b6f 100644 --- a/net/minecraft/world/entity/animal/coppergolem/CopperGolem.java +++ b/net/minecraft/world/entity/animal/coppergolem/CopperGolem.java -@@ -86,6 +_,7 @@ +@@ -86,6 +86,7 @@ public class CopperGolem extends AbstractGolem implements ContainerUser, Shearab private final AnimationState interactionDropItemAnimationState = new AnimationState(); private final AnimationState interactionDropNoItemAnimationState = new AnimationState(); public static final EquipmentSlot EQUIPMENT_SLOT_ANTENNA = EquipmentSlot.SADDLE; @@ -8,7 +16,7 @@ public CopperGolem(EntityType type, Level level) { super(type, level); -@@ -99,6 +_,17 @@ +@@ -99,6 +100,17 @@ public class CopperGolem extends AbstractGolem implements ContainerUser, Shearab this.getBrain().setMemory(MemoryModuleType.TRANSPORT_ITEMS_COOLDOWN_TICKS, this.getRandom().nextInt(60, 100)); } @@ -26,7 +34,7 @@ public static AttributeSupplier.Builder createAttributes() { return Mob.createMobAttributes().add(Attributes.MOVEMENT_SPEED, 0.2F).add(Attributes.STEP_HEIGHT, 1.0).add(Attributes.MAX_HEALTH, 12.0); } -@@ -174,6 +_,7 @@ +@@ -174,6 +186,7 @@ public class CopperGolem extends AbstractGolem implements ContainerUser, Shearab super.addAdditionalSaveData(output); output.putLong("next_weather_age", this.nextWeatheringTick); output.store("weather_state", WeatheringCopper.WeatherState.CODEC, this.getWeatherState()); @@ -34,7 +42,7 @@ } @Override -@@ -181,6 +_,7 @@ +@@ -181,6 +194,7 @@ public class CopperGolem extends AbstractGolem implements ContainerUser, Shearab super.readAdditionalSaveData(input); this.nextWeatheringTick = input.getLongOr("next_weather_age", -1L); this.setWeatherState(input.read("weather_state", WeatheringCopper.WeatherState.CODEC).orElse(WeatheringCopper.WeatherState.UNAFFECTED)); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/coppergolem/CopperGolemAi.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/coppergolem/CopperGolemAi.java.patch similarity index 75% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/coppergolem/CopperGolemAi.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/coppergolem/CopperGolemAi.java.patch index fb1800c03..0ce806f82 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/coppergolem/CopperGolemAi.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/coppergolem/CopperGolemAi.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/coppergolem/CopperGolemAi.java b/net/minecraft/world/entity/animal/coppergolem/CopperGolemAi.java +index e0875dd19a10cbf03daf67860993fb37ac0097e2..46e947adc04664839025c4167872c427d241b5d3 100644 --- a/net/minecraft/world/entity/animal/coppergolem/CopperGolemAi.java +++ b/net/minecraft/world/entity/animal/coppergolem/CopperGolemAi.java -@@ -43,7 +_,7 @@ +@@ -43,7 +43,7 @@ public class CopperGolemAi { private static final int TICK_TO_START_ON_REACHED_INTERACTION = 1; private static final int TICK_TO_PLAY_ON_REACHED_SOUND = 9; private static final Predicate TRANSPORT_ITEM_SOURCE_BLOCK = state -> state.is(BlockTags.COPPER_CHESTS); @@ -9,7 +17,7 @@ private static final ImmutableList>> SENSOR_TYPES = ImmutableList.of( SensorType.NEAREST_LIVING_ENTITIES, SensorType.HURT_BY ); -@@ -158,6 +_,11 @@ +@@ -158,6 +158,11 @@ public class CopperGolemAi { } if (integer == 60) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/goat/Goat.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/goat/Goat.java.patch similarity index 57% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/goat/Goat.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/goat/Goat.java.patch index f07c129d7..5ae3f8feb 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/goat/Goat.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/goat/Goat.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/goat/Goat.java b/net/minecraft/world/entity/animal/goat/Goat.java +index 7549be3f72beb31ce20cbac96f4909368d877067..4f87e06695e49c09078ab673119e2af9f5158bae 100644 --- a/net/minecraft/world/entity/animal/goat/Goat.java +++ b/net/minecraft/world/entity/animal/goat/Goat.java -@@ -390,6 +_,7 @@ +@@ -390,6 +390,7 @@ public class Goat extends Animal { // Paper start - Goat ram API public void ram(net.minecraft.world.entity.LivingEntity entity) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/horse/Llama.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/horse/Llama.java.patch similarity index 67% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/horse/Llama.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/horse/Llama.java.patch index 2dde9c392..1c649ae53 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/horse/Llama.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/horse/Llama.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/horse/Llama.java b/net/minecraft/world/entity/animal/horse/Llama.java +index 050daf9e733b1b9edfa9862c5baf5e5412431fed..bcbbcea51261a2f1d6fbe3463e06900a6cd3d0ba 100644 --- a/net/minecraft/world/entity/animal/horse/Llama.java +++ b/net/minecraft/world/entity/animal/horse/Llama.java -@@ -78,6 +_,7 @@ +@@ -78,6 +78,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob { private Llama caravanHead; @Nullable public Llama caravanTail; // Paper - public @@ -8,7 +16,7 @@ public Llama(EntityType type, Level level) { super(type, level); -@@ -107,6 +_,7 @@ +@@ -107,6 +108,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob { super.addAdditionalSaveData(output); output.store("Variant", Llama.Variant.LEGACY_CODEC, this.getVariant()); output.putInt("Strength", this.getStrength()); @@ -16,7 +24,7 @@ } @Override -@@ -114,6 +_,7 @@ +@@ -114,6 +116,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob { this.setStrength(input.getIntOr("Strength", 0)); super.readAdditionalSaveData(input); this.setVariant(input.read("Variant", Llama.Variant.LEGACY_CODEC).orElse(Llama.Variant.DEFAULT)); @@ -24,7 +32,7 @@ } @Override -@@ -395,6 +_,7 @@ +@@ -395,6 +398,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob { public void leaveCaravan() { if (this.caravanHead != null) { @@ -32,7 +40,7 @@ this.caravanHead.caravanTail = null; } -@@ -402,6 +_,7 @@ +@@ -402,6 +406,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob { } public void joinCaravan(Llama caravanHead) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/wolf/Wolf.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/wolf/Wolf.java.patch similarity index 89% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/wolf/Wolf.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/wolf/Wolf.java.patch index c95115fd1..81278bd9c 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/wolf/Wolf.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/animal/wolf/Wolf.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/animal/wolf/Wolf.java b/net/minecraft/world/entity/animal/wolf/Wolf.java +index 752e20872725fc11d0f7d8f1d5e7fad87f01db28..9f79615cda890d5823fda94bad5b8cddde22e14d 100644 --- a/net/minecraft/world/entity/animal/wolf/Wolf.java +++ b/net/minecraft/world/entity/animal/wolf/Wolf.java -@@ -100,6 +_,37 @@ +@@ -100,6 +100,37 @@ public class Wolf extends TamableAnimal implements NeutralMob { EntityType type = entity.getType(); return type == EntityType.SHEEP || type == EntityType.RABBIT || type == EntityType.FOX; }; @@ -38,7 +46,7 @@ private static final float START_HEALTH = 8.0F; private static final float TAME_HEALTH = 40.0F; private static final float ARMOR_REPAIR_UNIT = 0.125F; -@@ -122,12 +_,47 @@ +@@ -122,12 +153,47 @@ public class Wolf extends TamableAnimal implements NeutralMob { this.setPathfindingMalus(PathType.DANGER_POWDER_SNOW, -1.0F); } @@ -86,7 +94,7 @@ this.goalSelector.addGoal(4, new LeapAtTargetGoal(this, 0.4F)); this.goalSelector.addGoal(5, new MeleeAttackGoal(this, 1.0, true)); this.goalSelector.addGoal(6, new FollowOwnerGoal(this, 1.0, 10.0F, 2.0F)); -@@ -140,7 +_,7 @@ +@@ -140,7 +206,7 @@ public class Wolf extends TamableAnimal implements NeutralMob { this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this)); this.targetSelector.addGoal(3, new HurtByTargetGoal(this).setAlertOthers()); this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt)); @@ -95,7 +103,7 @@ this.targetSelector.addGoal(6, new NonTameRandomTargetGoal<>(this, Turtle.class, false, Turtle.BABY_ON_LAND_SELECTOR)); this.targetSelector.addGoal(7, new NearestAttackableTargetGoal<>(this, AbstractSkeleton.class, false)); this.targetSelector.addGoal(8, new ResetUniversalAngerTargetGoal<>(this, true)); -@@ -231,6 +_,7 @@ +@@ -231,6 +297,7 @@ public class Wolf extends TamableAnimal implements NeutralMob { protected void addAdditionalSaveData(ValueOutput output) { super.addAdditionalSaveData(output); output.store("CollarColor", DyeColor.LEGACY_ID_CODEC, this.getCollarColor()); @@ -103,7 +111,7 @@ VariantUtils.writeVariant(output, this.getVariant()); this.addPersistentAngerSaveData(output); this.getSoundVariant() -@@ -245,6 +_,10 @@ +@@ -245,6 +312,10 @@ public class Wolf extends TamableAnimal implements NeutralMob { super.readAdditionalSaveData(input); VariantUtils.readVariant(input, Registries.WOLF_VARIANT).ifPresent(this::setVariant); this.setCollarColor(input.read("CollarColor", DyeColor.LEGACY_ID_CODEC).orElse(DEFAULT_COLLAR_COLOR)); @@ -114,7 +122,7 @@ this.readPersistentAngerSaveData(this.level(), input); input.read("sound_variant", ResourceKey.codec(Registries.WOLF_SOUND_VARIANT)) .flatMap(resourceKey -> this.registryAccess().lookupOrThrow(Registries.WOLF_SOUND_VARIANT).get((ResourceKey)resourceKey)) -@@ -269,6 +_,10 @@ +@@ -269,6 +340,10 @@ public class Wolf extends TamableAnimal implements NeutralMob { } this.setSoundVariant(WolfSoundVariants.pickRandomSoundVariant(this.registryAccess(), level.getRandom())); @@ -125,7 +133,7 @@ return super.finalizeSpawn(level, difficulty, spawnReason, spawnGroupData); } -@@ -319,6 +_,11 @@ +@@ -319,6 +394,11 @@ public class Wolf extends TamableAnimal implements NeutralMob { public void tick() { super.tick(); if (this.isAlive()) { @@ -137,7 +145,7 @@ this.interestedAngleO = this.interestedAngle; if (this.isInterested()) { this.interestedAngle = this.interestedAngle + (1.0F - this.interestedAngle) * 0.4F; -@@ -520,13 +_,27 @@ +@@ -520,13 +600,27 @@ public class Wolf extends TamableAnimal implements NeutralMob { itemInHand.consume(1, player); this.tryToTame(player); return InteractionResult.SUCCESS_SERVER; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch similarity index 84% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch index b58f13a85..a40c502e4 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java +index 4fc773a0cb9d68e22e4d6cc7d819196a6cabf4f1..9503ec9d44a6c0811639b7d0cf504d32fefff58d 100644 --- a/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java +++ b/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java -@@ -39,6 +_,24 @@ +@@ -39,6 +39,24 @@ public class EndCrystal extends Entity { this.setPos(x, y, z); } @@ -25,7 +33,7 @@ @Override protected Entity.MovementEmission getMovementEmission() { return Entity.MovementEmission.NONE; -@@ -75,6 +_,8 @@ +@@ -75,6 +93,8 @@ public class EndCrystal extends Entity { } } // Paper end - Fix invulnerable end crystals @@ -34,7 +42,7 @@ } @Override -@@ -115,15 +_,17 @@ +@@ -115,15 +135,17 @@ public class EndCrystal extends Entity { } // CraftBukkit end if (!damageSource.is(DamageTypeTags.IS_EXPLOSION)) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java.patch similarity index 58% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java.patch index 68b24b0fc..c69e4248a 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +index 465674ed712667a72e532cc62b11e93433cfdac6..14216ad9e1182dd9c380c79b1f1f3926ad6f458b 100644 --- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java -@@ -962,6 +_,7 @@ +@@ -962,6 +962,7 @@ public class EnderDragon extends Mob implements Enemy { @Override protected boolean canRide(Entity entity) { @@ -8,7 +16,7 @@ return false; } -@@ -997,7 +_,7 @@ +@@ -997,7 +998,7 @@ public class EnderDragon extends Mob implements Enemy { boolean flag = level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT); int i = 500; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/wither/WitherBoss.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/boss/wither/WitherBoss.java.patch similarity index 76% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/wither/WitherBoss.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/boss/wither/WitherBoss.java.patch index 219e4e227..d0eb27f79 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/wither/WitherBoss.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/boss/wither/WitherBoss.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java +index 6d304da949f271cf41cf5897e08afd936fdf7bed..d94d1d673dbb69742203119d1ef6bf0404efaada 100644 --- a/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java -@@ -80,6 +_,7 @@ +@@ -80,6 +80,7 @@ public class WitherBoss extends Monster implements RangedAttackMob { private static final TargetingConditions.Selector LIVING_ENTITY_SELECTOR = (entity, level) -> !entity.getType().is(EntityTypeTags.WITHER_FRIENDS) && entity.attackable(); private static final TargetingConditions TARGETING_CONDITIONS = TargetingConditions.forCombat().range(20.0).selector(LIVING_ENTITY_SELECTOR); @@ -8,7 +16,7 @@ public WitherBoss(EntityType type, Level level) { super(type, level); -@@ -88,6 +_,17 @@ +@@ -88,6 +89,17 @@ public class WitherBoss extends Monster implements RangedAttackMob { this.xpReward = 50; } @@ -26,7 +34,7 @@ @Override protected PathNavigation createNavigation(Level level) { FlyingPathNavigation flyingPathNavigation = new FlyingPathNavigation(this, level); -@@ -120,6 +_,7 @@ +@@ -120,6 +132,7 @@ public class WitherBoss extends Monster implements RangedAttackMob { protected void addAdditionalSaveData(ValueOutput output) { super.addAdditionalSaveData(output); output.putInt("Invul", this.getInvulnerableTicks()); @@ -34,7 +42,7 @@ } @Override -@@ -129,6 +_,7 @@ +@@ -129,6 +142,7 @@ public class WitherBoss extends Monster implements RangedAttackMob { if (this.hasCustomName()) { this.bossEvent.setName(this.getDisplayName()); } @@ -42,7 +50,7 @@ } @Override -@@ -272,7 +_,7 @@ +@@ -272,7 +286,7 @@ public class WitherBoss extends Monster implements RangedAttackMob { level.explode(this, this.getX(), this.getEyeY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB); } // CraftBukkit end @@ -51,7 +59,7 @@ // CraftBukkit start - Use relative location for far away sounds // level.globalLevelEvent(1023, this.blockPosition(), 0); int viewDistance = level.getCraftServer().getViewDistance() * 16; -@@ -379,8 +_,10 @@ +@@ -379,8 +393,10 @@ public class WitherBoss extends Monster implements RangedAttackMob { } } @@ -64,7 +72,7 @@ } this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth()); -@@ -577,6 +_,7 @@ +@@ -577,6 +593,7 @@ public class WitherBoss extends Monster implements RangedAttackMob { @Override protected boolean canRide(Entity entity) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch similarity index 76% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch index 503f2d42c..2d4089964 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/decoration/ArmorStand.java b/net/minecraft/world/entity/decoration/ArmorStand.java +index 15479a9fc47cca3d6627b42c31ba8ff114bbe362..f329459ad97ed4ea5297455d4741d008acb32750 100644 --- a/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/net/minecraft/world/entity/decoration/ArmorStand.java -@@ -92,10 +_,13 @@ +@@ -92,10 +92,13 @@ public class ArmorStand extends LivingEntity { public boolean canTickSetByAPI = false; private boolean noTickEquipmentDirty = false; // Paper end - Allow ArmorStands not to tick @@ -14,7 +22,7 @@ } public ArmorStand(Level level, double x, double y, double z) { -@@ -522,6 +_,7 @@ +@@ -522,6 +525,7 @@ public class ArmorStand extends LivingEntity { // Paper start - Allow ArmorStands not to tick @Override public void tick() { @@ -22,7 +30,7 @@ if (!this.canTick) { if (this.noTickEquipmentDirty) { this.noTickEquipmentDirty = false; -@@ -812,4 +_,18 @@ +@@ -812,4 +816,18 @@ public class ArmorStand extends LivingEntity { } } // Paper end diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/item/ItemEntity.java.patch similarity index 81% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/item/ItemEntity.java.patch index 6b6f90ef3..07f13273d 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/item/ItemEntity.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/item/ItemEntity.java b/net/minecraft/world/entity/item/ItemEntity.java +index 6be576368695c902a0d6da74b1d77d3018b4585a..8153c870c0c822792ffbb0fa1ae96b201a1444e3 100644 --- a/net/minecraft/world/entity/item/ItemEntity.java +++ b/net/minecraft/world/entity/item/ItemEntity.java -@@ -56,6 +_,12 @@ +@@ -56,6 +56,12 @@ public class ItemEntity extends Entity implements TraceableEntity { public boolean canMobPickup = true; // Paper - Item#canEntityPickup private int despawnRate = -1; // Paper - Alternative item-despawn-rate public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API @@ -13,7 +21,7 @@ public ItemEntity(EntityType type, Level level) { super(type, level); -@@ -333,7 +_,16 @@ +@@ -333,7 +339,16 @@ public class ItemEntity extends Entity implements TraceableEntity { @Override public final boolean hurtServer(ServerLevel level, DamageSource damageSource, float amount) { @@ -31,7 +39,7 @@ return false; } else if (!level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) && damageSource.getEntity() instanceof Mob) { return false; -@@ -512,6 +_,12 @@ +@@ -512,6 +527,12 @@ public class ItemEntity extends Entity implements TraceableEntity { public void setItem(ItemStack stack) { this.getEntityData().set(DATA_ITEM, stack); this.despawnRate = this.level().paperConfig().entities.spawning.altItemDespawnRate.enabled ? this.level().paperConfig().entities.spawning.altItemDespawnRate.items.getOrDefault(stack.getItem(), this.level().spigotConfig.itemDespawnRate) : this.level().spigotConfig.itemDespawnRate; // Paper - Alternative item-despawn-rate diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/PrimedTnt.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/item/PrimedTnt.java.patch similarity index 78% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/PrimedTnt.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/item/PrimedTnt.java.patch index cdbd63960..ed401803c 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/item/PrimedTnt.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/item/PrimedTnt.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java +index c685b5123c88fc73c26a3ba31225ab1226e52702..b988aa11c403a1b520ec5630f2f11593c7507a05 100644 --- a/net/minecraft/world/entity/item/PrimedTnt.java +++ b/net/minecraft/world/entity/item/PrimedTnt.java -@@ -238,4 +_,32 @@ +@@ -238,4 +238,32 @@ public class PrimedTnt extends Entity implements TraceableEntity { return !this.level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid(); } // Paper end - Option to prevent TNT from moving in water diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch similarity index 75% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch index 10ddc966a..180299832 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/AbstractSkeleton.java b/net/minecraft/world/entity/monster/AbstractSkeleton.java +index e52106704041d6bbc1670f425c3879e945d27a5f..3d2fcdc99cea6981c8d516853ba28f51bd114dbd 100644 --- a/net/minecraft/world/entity/monster/AbstractSkeleton.java +++ b/net/minecraft/world/entity/monster/AbstractSkeleton.java -@@ -158,10 +_,7 @@ +@@ -158,10 +158,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo this.reassessWeaponGoal(); this.setCanPickUpLoot(this.level().paperConfig().entities.behavior.mobsCanAlwaysPickUpLoot.skeletons || random.nextFloat() < 0.55F * difficulty.getSpecialMultiplier()); // Paper - Add world settings for mobs picking up loot if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) { @@ -12,7 +20,7 @@ this.setItemSlot(EquipmentSlot.HEAD, new ItemStack(random.nextFloat() < 0.1F ? Blocks.JACK_O_LANTERN : Blocks.CARVED_PUMPKIN)); this.setDropChance(EquipmentSlot.HEAD, 0.0F); } -@@ -209,7 +_,7 @@ +@@ -209,7 +206,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo double squareRoot = Math.sqrt(d * d + d2 * d2); if (this.level() instanceof ServerLevel serverLevel) { Projectile.Delayed delayedEntity = Projectile.spawnProjectileUsingShootDelayed( // Paper - delayed diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Creeper.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Creeper.java.patch similarity index 86% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Creeper.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Creeper.java.patch index 616f3be1d..9c9456c69 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Creeper.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Creeper.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/Creeper.java b/net/minecraft/world/entity/monster/Creeper.java +index 10d8975a229c000c1610f4927358fa44bae40c23..c3386bd6028a9391d2eb00567b711f89b4585608 100644 --- a/net/minecraft/world/entity/monster/Creeper.java +++ b/net/minecraft/world/entity/monster/Creeper.java -@@ -56,6 +_,7 @@ +@@ -56,6 +56,7 @@ public class Creeper extends Monster { public int explosionRadius = 3; public boolean droppedSkulls; public @Nullable Entity entityIgniter; // CraftBukkit @@ -8,7 +16,7 @@ public Creeper(EntityType type, Level level) { super(type, level); -@@ -159,6 +_,27 @@ +@@ -159,6 +160,27 @@ public class Creeper extends Monster { return false; // CraftBukkit } @@ -36,7 +44,7 @@ @Override public SoundEvent getHurtSound(DamageSource damageSource) { return SoundEvents.CREEPER_HURT; -@@ -243,14 +_,16 @@ +@@ -243,14 +265,16 @@ public class Creeper extends Monster { } public void explodeCreeper() { @@ -55,7 +63,7 @@ this.spawnLingeringCloud(); this.triggerOnDeathMobEffects(serverLevel, Entity.RemovalReason.KILLED); this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause -@@ -261,6 +_,7 @@ +@@ -261,6 +285,7 @@ public class Creeper extends Monster { } // CraftBukkit end } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Drowned.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Drowned.java.patch similarity index 83% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Drowned.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Drowned.java.patch index 89708242d..4000e13bd 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Drowned.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Drowned.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/Drowned.java b/net/minecraft/world/entity/monster/Drowned.java +index 26464ff611adaf80e7685b883ec1f7ac4f75db82..6c51ecee06538de51ce02ea73e173a766ce8515c 100644 --- a/net/minecraft/world/entity/monster/Drowned.java +++ b/net/minecraft/world/entity/monster/Drowned.java -@@ -83,10 +_,23 @@ +@@ -83,10 +83,23 @@ public class Drowned extends Zombie implements RangedAttackMob { this.goalSelector.addGoal(2, new Drowned.DrownedAttackGoal(this, 1.0, false)); this.goalSelector.addGoal(5, new Drowned.DrownedGoToBeachGoal(this, 1.0)); this.goalSelector.addGoal(6, new Drowned.DrownedSwimUpGoal(this, 1.0, this.level().getSeaLevel())); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/EnderMan.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/EnderMan.java.patch similarity index 81% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/EnderMan.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/EnderMan.java.patch index 9287c2159..e834b9207 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/EnderMan.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/EnderMan.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java +index 9b63c55a61b511ebad6c94b48926cfdf544b0449..87aaa6cd478d8d635b625d1a98bce23d577fb33a 100644 --- a/net/minecraft/world/entity/monster/EnderMan.java +++ b/net/minecraft/world/entity/monster/EnderMan.java -@@ -102,7 +_,7 @@ +@@ -102,7 +102,7 @@ public class EnderMan extends Monster implements NeutralMob { this.goalSelector.addGoal(11, new EnderMan.EndermanTakeBlockGoal(this)); this.targetSelector.addGoal(1, new EnderMan.EndermanLookForPlayerGoal(this, this::isAngryAt)); this.targetSelector.addGoal(2, new HurtByTargetGoal(this)); @@ -9,7 +17,7 @@ this.targetSelector.addGoal(4, new ResetUniversalAngerTargetGoal<>(this, false)); } -@@ -222,7 +_,7 @@ +@@ -222,7 +222,7 @@ public class EnderMan extends Monster implements NeutralMob { boolean isBeingStaredBy(Player player) { // Paper start - EndermanAttackPlayerEvent @@ -18,7 +26,7 @@ final com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent event = new com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent((org.bukkit.entity.Enderman) getBukkitEntity(), (org.bukkit.entity.Player) player.getBukkitEntity()); event.setCancelled(!shouldAttack); return event.callEvent(); -@@ -378,6 +_,7 @@ +@@ -378,6 +378,7 @@ public class EnderMan extends Monster implements NeutralMob { public boolean hurtServer(ServerLevel level, DamageSource damageSource, float amount) { if (this.isInvulnerableTo(level, damageSource)) { return false; @@ -26,7 +34,7 @@ } else { AbstractThrownPotion abstractThrownPotion1 = damageSource.getDirectEntity() instanceof AbstractThrownPotion abstractThrownPotion ? abstractThrownPotion -@@ -394,6 +_,7 @@ +@@ -394,6 +395,7 @@ public class EnderMan extends Monster implements NeutralMob { } else { boolean flag = abstractThrownPotion1 != null && this.hurtWithCleanWater(level, damageSource, abstractThrownPotion1, amount); @@ -34,7 +42,7 @@ if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper - EndermanEscapeEvent for (int i = 0; i < 64; i++) { if (this.teleport()) { -@@ -437,7 +_,7 @@ +@@ -437,7 +439,7 @@ public class EnderMan extends Monster implements NeutralMob { @Override public boolean requiresCustomPersistence() { @@ -43,7 +51,7 @@ } static class EndermanFreezeWhenLookedAt extends Goal { -@@ -481,6 +_,7 @@ +@@ -481,6 +483,7 @@ public class EnderMan extends Monster implements NeutralMob { @Override public boolean canUse() { @@ -51,7 +59,7 @@ return this.enderman.getCarriedBlock() != null && getServerLevel(this.enderman).getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) && this.enderman.getRandom().nextInt(reducedTickDelay(2000)) == 0; -@@ -630,6 +_,7 @@ +@@ -630,6 +633,7 @@ public class EnderMan extends Monster implements NeutralMob { @Override public boolean canUse() { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Endermite.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Endermite.java.patch similarity index 74% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Endermite.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Endermite.java.patch index a399138fa..d28f4ab84 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Endermite.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Endermite.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/Endermite.java b/net/minecraft/world/entity/monster/Endermite.java +index cabf4d06ede5ea155fea5a0d7a17e67c0de8754f..980ec0e45581812c027bb2ce8cd25d74e5f10663 100644 --- a/net/minecraft/world/entity/monster/Endermite.java +++ b/net/minecraft/world/entity/monster/Endermite.java -@@ -30,12 +_,23 @@ +@@ -30,12 +30,23 @@ public class Endermite extends Monster { private static final int MAX_LIFE = 2400; private static final int DEFAULT_LIFE = 0; public int life = 0; @@ -24,7 +32,7 @@ @Override protected void registerGoals() { this.goalSelector.addGoal(1, new FloatGoal(this)); -@@ -81,12 +_,14 @@ +@@ -81,12 +92,14 @@ public class Endermite extends Monster { protected void readAdditionalSaveData(ValueInput input) { super.readAdditionalSaveData(input); this.life = input.getIntOr("Lifetime", 0); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Ghast.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Ghast.java.patch similarity index 61% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Ghast.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Ghast.java.patch index c05e83d84..77130f05b 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Ghast.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Ghast.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/Ghast.java b/net/minecraft/world/entity/monster/Ghast.java +index 8f9a299d9e448fad46fa704542a909f6bb90e713..9954f5173c427d8c61e283d9bb2dac42c296f357 100644 --- a/net/minecraft/world/entity/monster/Ghast.java +++ b/net/minecraft/world/entity/monster/Ghast.java -@@ -156,6 +_,11 @@ +@@ -156,6 +156,11 @@ public class Ghast extends Mob implements Enemy { public static boolean checkGhastSpawnRules( EntityType entityType, LevelAccessor level, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random ) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Guardian.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Guardian.java.patch similarity index 63% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Guardian.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Guardian.java.patch index 34f6b89aa..e1c201197 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Guardian.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Guardian.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/Guardian.java b/net/minecraft/world/entity/monster/Guardian.java +index c907feb2ab6862d980f89f6341402131a8a966f2..cd802866af8ed2d0ebd5f8dabe170848cbf4638a 100644 --- a/net/minecraft/world/entity/monster/Guardian.java +++ b/net/minecraft/world/entity/monster/Guardian.java -@@ -315,6 +_,11 @@ +@@ -315,6 +315,11 @@ public class Guardian extends Monster { public static boolean checkGuardianSpawnRules( EntityType entityType, LevelAccessor level, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random ) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/MagmaCube.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/MagmaCube.java.patch similarity index 58% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/MagmaCube.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/MagmaCube.java.patch index 358fa1924..53eb6bd47 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/MagmaCube.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/MagmaCube.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/MagmaCube.java b/net/minecraft/world/entity/monster/MagmaCube.java +index 034a41573c330b2366fb305bb0796293d5d6a187..2323a7315878e38710f8f31f7806ebda94077067 100644 --- a/net/minecraft/world/entity/monster/MagmaCube.java +++ b/net/minecraft/world/entity/monster/MagmaCube.java -@@ -31,6 +_,11 @@ +@@ -31,6 +31,11 @@ public class MagmaCube extends Slime { public static boolean checkMagmaCubeSpawnRules( EntityType entityType, LevelAccessor level, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random ) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Monster.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Monster.java.patch similarity index 73% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Monster.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Monster.java.patch index 8e8c03d48..f472e4d88 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Monster.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Monster.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/Monster.java b/net/minecraft/world/entity/monster/Monster.java +index e792298d50ed7b7112f862d3b820a03fd9b05550..7c420f567f7841f45acd91b9749cab150397f5e2 100644 --- a/net/minecraft/world/entity/monster/Monster.java +++ b/net/minecraft/world/entity/monster/Monster.java -@@ -84,6 +_,11 @@ +@@ -84,6 +84,11 @@ public abstract class Monster extends PathfinderMob implements Enemy { } public static boolean isDarkEnoughToSpawn(ServerLevelAccessor level, BlockPos pos, RandomSource random) { @@ -12,7 +20,7 @@ if (level.getBrightness(LightLayer.SKY, pos) > random.nextInt(32)) { return false; } else { -@@ -109,6 +_,11 @@ +@@ -109,6 +114,11 @@ public abstract class Monster extends PathfinderMob implements Enemy { public static boolean checkAnyLightMonsterSpawnRules( EntityType entityType, LevelAccessor level, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random ) { @@ -24,7 +32,7 @@ return level.getDifficulty() != Difficulty.PEACEFUL && checkMobSpawnRules(entityType, level, spawnReason, pos, random); } -@@ -140,4 +_,12 @@ +@@ -140,4 +150,12 @@ public abstract class Monster extends PathfinderMob implements Enemy { return ItemStack.EMPTY; } } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Phantom.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Phantom.java.patch similarity index 62% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Phantom.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Phantom.java.patch index c33845e7b..713252b0d 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Phantom.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Phantom.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java +index b0f0a70ef6d708917ac8278c7eebd81d1fd7df6a..7da7dfaf400e69434417f6f85d5d021235d11162 100644 --- a/net/minecraft/world/entity/monster/Phantom.java +++ b/net/minecraft/world/entity/monster/Phantom.java -@@ -170,7 +_,11 @@ +@@ -170,7 +170,11 @@ public class Phantom extends Mob implements Enemy { ServerLevelAccessor level, DifficultyInstance difficulty, EntitySpawnReason spawnReason, @Nullable SpawnGroupData spawnGroupData ) { this.anchorPoint = this.blockPosition().above(5); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Ravager.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Ravager.java.patch similarity index 73% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Ravager.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Ravager.java.patch index 2e7516440..5eaa73e47 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Ravager.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Ravager.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/Ravager.java b/net/minecraft/world/entity/monster/Ravager.java +index 1686abac483f319d958079e8c4617c4d74a0c4af..da20eb6eaadd9468fcc96f022d67d4583371d717 100644 --- a/net/minecraft/world/entity/monster/Ravager.java +++ b/net/minecraft/world/entity/monster/Ravager.java -@@ -75,6 +_,7 @@ +@@ -75,6 +75,7 @@ public class Ravager extends Raider { protected void registerGoals() { super.registerGoals(); this.goalSelector.addGoal(0, new FloatGoal(this)); @@ -8,7 +16,7 @@ this.goalSelector.addGoal(4, new MeleeAttackGoal(this, 1.0, true)); this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 0.4)); this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F)); -@@ -155,7 +_,7 @@ +@@ -155,7 +156,7 @@ public class Ravager extends Raider { )) { BlockState blockState = serverLevel.getBlockState(blockPos); Block block = blockState.getBlock(); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Shulker.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Shulker.java.patch similarity index 83% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Shulker.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Shulker.java.patch index 3f4ca504d..b273fc2bb 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Shulker.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Shulker.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java +index 7c56d3d5d24d25c4d70a19be256b5cbe9374f09f..d0bcd2d1f7afd4a01c9a0f7d66082df38db50edd 100644 --- a/net/minecraft/world/entity/monster/Shulker.java +++ b/net/minecraft/world/entity/monster/Shulker.java -@@ -94,6 +_,21 @@ +@@ -94,6 +94,21 @@ public class Shulker extends AbstractGolem implements Enemy { this.lookControl = new Shulker.ShulkerLookControl(this); } @@ -22,7 +30,7 @@ @Override protected void registerGoals() { this.goalSelector.addGoal(1, new LookAtPlayerGoal(this, Player.class, 8.0F, 0.02F, true)); -@@ -457,11 +_,21 @@ +@@ -457,11 +472,21 @@ public class Shulker extends AbstractGolem implements Enemy { private void hitByShulkerBullet() { Vec3 vec3 = this.position(); AABB boundingBox = this.getBoundingBox(); @@ -48,7 +56,7 @@ if (shulker != null) { shulker.setVariant(this.getVariant()); shulker.snapTo(vec3); -@@ -569,7 +_,7 @@ +@@ -569,7 +594,7 @@ public class Shulker extends AbstractGolem implements Enemy { } public Optional getVariant() { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Skeleton.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Skeleton.java.patch similarity index 87% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Skeleton.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Skeleton.java.patch index 0425ced22..ab396cf37 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Skeleton.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Skeleton.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/Skeleton.java b/net/minecraft/world/entity/monster/Skeleton.java +index 37a60cf7b00adaadbca129659b3aea3d8f10c4e2..fb0aa6f0713f6ab1d26711d3fce920de91deb980 100644 --- a/net/minecraft/world/entity/monster/Skeleton.java +++ b/net/minecraft/world/entity/monster/Skeleton.java -@@ -130,4 +_,64 @@ +@@ -130,4 +130,64 @@ public class Skeleton extends AbstractSkeleton { SoundEvent getStepSound() { return SoundEvents.SKELETON_STEP; } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Slime.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Slime.java.patch similarity index 62% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Slime.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Slime.java.patch index a35f7c4eb..8f51138fd 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Slime.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Slime.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/Slime.java b/net/minecraft/world/entity/monster/Slime.java +index 6a4bdf6e8e785460c864552f21116dec8c545bd6..7abd42fa34c80e868875f0ff3986a85d1a6dcb8c 100644 --- a/net/minecraft/world/entity/monster/Slime.java +++ b/net/minecraft/world/entity/monster/Slime.java -@@ -301,6 +_,11 @@ +@@ -301,6 +301,11 @@ public class Slime extends Mob implements Enemy { public static boolean checkSlimeSpawnRules( EntityType entityType, LevelAccessor level, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random ) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Strider.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Strider.java.patch similarity index 68% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Strider.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Strider.java.patch index ff1946c68..32705c91a 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Strider.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Strider.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/Strider.java b/net/minecraft/world/entity/monster/Strider.java +index 402723c86ffb8da0f4ed5529a762d2eed151e73e..312564fcaf91280d70e379994bd9d8fcb54b0a40 100644 --- a/net/minecraft/world/entity/monster/Strider.java +++ b/net/minecraft/world/entity/monster/Strider.java -@@ -393,6 +_,18 @@ +@@ -393,6 +393,18 @@ public class Strider extends Animal implements ItemSteerable { @Override public InteractionResult mobInteract(Player player, InteractionHand hand) { boolean isFood = this.isFood(player.getItemInHand(hand)); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Vindicator.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Vindicator.java.patch similarity index 58% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Vindicator.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Vindicator.java.patch index 26ace8b3e..94e72a55f 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Vindicator.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Vindicator.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/Vindicator.java b/net/minecraft/world/entity/monster/Vindicator.java +index 714ebce87550e3d36cb269fcb5653975113671db..29482ed26387e5d6f04d59deda5990d24b7a07a9 100644 --- a/net/minecraft/world/entity/monster/Vindicator.java +++ b/net/minecraft/world/entity/monster/Vindicator.java -@@ -131,6 +_,11 @@ +@@ -131,6 +131,11 @@ public class Vindicator extends AbstractIllager { RandomSource random = level.getRandom(); this.populateDefaultEquipmentSlots(random, difficulty); this.populateDefaultEquipmentEnchantments(level, random, difficulty); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Zombie.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Zombie.java.patch similarity index 82% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Zombie.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Zombie.java.patch index c07653823..7e965f461 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Zombie.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/Zombie.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java +index afe4a2304268224f6b0a1cc40a41f7b67f9d3275..81e9e2d87e8ea4645ee95559a08c765c1d96a65a 100644 --- a/net/minecraft/world/entity/monster/Zombie.java +++ b/net/minecraft/world/entity/monster/Zombie.java -@@ -117,7 +_,19 @@ +@@ -117,7 +117,19 @@ public class Zombie extends Monster { this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0)); this.targetSelector.addGoal(1, new HurtByTargetGoal(this).setAlertOthers(ZombifiedPiglin.class)); this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true)); @@ -21,7 +29,7 @@ this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true)); this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR)); } -@@ -551,10 +_,7 @@ +@@ -551,10 +563,7 @@ public class Zombie extends Monster { } if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombieVillager.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/ZombieVillager.java.patch similarity index 68% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombieVillager.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/ZombieVillager.java.patch index 8f30c483c..58931580d 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombieVillager.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/ZombieVillager.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java +index c7148075df2c80f2172ce5e5b490fc89787cc338..e9cf8809fffaba98e352c6d47719a816aad4cce4 100644 --- a/net/minecraft/world/entity/monster/ZombieVillager.java +++ b/net/minecraft/world/entity/monster/ZombieVillager.java -@@ -140,10 +_,10 @@ +@@ -140,10 +140,10 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder { public InteractionResult mobInteract(Player player, InteractionHand hand) { ItemStack itemInHand = player.getItemInHand(hand); if (itemInHand.is(Items.GOLDEN_APPLE)) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch similarity index 71% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch index cd9485fcf..57efaa1f3 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/net/minecraft/world/entity/monster/ZombifiedPiglin.java +index d862e16f24a11e52d6d454bbf330bce4abe96db4..08997d05ff75f68cd36c90eb8730dc44a052d5b8 100644 --- a/net/minecraft/world/entity/monster/ZombifiedPiglin.java +++ b/net/minecraft/world/entity/monster/ZombifiedPiglin.java -@@ -113,6 +_,12 @@ +@@ -113,6 +113,12 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob { this.maybeAlertOthers(); } @@ -13,7 +21,7 @@ super.customServerAiStep(level); } -@@ -160,6 +_,12 @@ +@@ -160,6 +166,12 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob { this.ticksUntilNextAlert = ALERT_INTERVAL.sample(this.random); } @@ -26,7 +34,7 @@ return super.setTarget(target, reason); // CraftBukkit } -@@ -180,6 +_,11 @@ +@@ -180,6 +192,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob { public static boolean checkZombifiedPiglinSpawnRules( EntityType entityType, LevelAccessor level, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random ) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/hoglin/Hoglin.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/hoglin/Hoglin.java.patch similarity index 57% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/hoglin/Hoglin.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/hoglin/Hoglin.java.patch index 39c40207c..dee1c3ac3 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/hoglin/Hoglin.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/hoglin/Hoglin.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/net/minecraft/world/entity/monster/hoglin/Hoglin.java +index a60f40c7986bbcec854df490bd66111a79fc635a..56a1e933b4b135890bec5104ef9f3cdf21ac2ff6 100644 --- a/net/minecraft/world/entity/monster/hoglin/Hoglin.java +++ b/net/minecraft/world/entity/monster/hoglin/Hoglin.java -@@ -201,6 +_,11 @@ +@@ -201,6 +201,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { public static boolean checkHoglinSpawnRules( EntityType entityType, LevelAccessor level, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random ) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/Piglin.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/piglin/Piglin.java.patch similarity index 55% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/Piglin.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/piglin/Piglin.java.patch index 1fa00c0ee..46b903c7f 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/Piglin.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/piglin/Piglin.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/piglin/Piglin.java b/net/minecraft/world/entity/monster/piglin/Piglin.java +index fbbf7364b07ea49116dd86fa9722fa341978bc19..072358efcc92f510d5281b7f37f8c36df85c2e4c 100644 --- a/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/net/minecraft/world/entity/monster/piglin/Piglin.java -@@ -203,6 +_,11 @@ +@@ -203,6 +203,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento public static boolean checkPiglinSpawnRules( EntityType entityType, LevelAccessor level, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random ) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch similarity index 72% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch index ae53e80fd..8eaa1f45e 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/net/minecraft/world/entity/monster/piglin/PiglinAi.java +index 4b1a3772f9e6b9e4efcf11e14b0fb882512ec86d..2841c765b2bd804f08bd0e603b4b29cf8a801fab 100644 --- a/net/minecraft/world/entity/monster/piglin/PiglinAi.java +++ b/net/minecraft/world/entity/monster/piglin/PiglinAi.java -@@ -661,13 +_,23 @@ +@@ -661,7 +661,10 @@ public class PiglinAi { public static boolean isWearingSafeArmor(LivingEntity entity) { for (EquipmentSlot equipmentSlot : EquipmentSlotGroup.ARMOR) { @@ -12,16 +20,17 @@ return true; } } - +@@ -669,6 +672,13 @@ public class PiglinAi { return false; } -+ + + // Purpur start - piglins ignore gold-trimmed armor + private static boolean isWearingGoldTrim(net.minecraft.world.item.ItemStack itemstack) { + net.minecraft.world.item.equipment.trim.ArmorTrim armorTrim = itemstack.getComponents().get(net.minecraft.core.component.DataComponents.TRIM); + return armorTrim != null && armorTrim.material().is(net.minecraft.world.item.equipment.trim.TrimMaterials.GOLD); + } + // Purpur end - piglins ignore gold-trimmed armor - ++ private static void stopWalking(Piglin piglin) { piglin.getBrain().eraseMemory(MemoryModuleType.WALK_TARGET); + piglin.getNavigation().stop(); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/warden/WardenAi.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/warden/WardenAi.java.patch similarity index 73% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/warden/WardenAi.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/warden/WardenAi.java.patch index 6c45d2405..a5864d626 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/warden/WardenAi.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/monster/warden/WardenAi.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/monster/warden/WardenAi.java b/net/minecraft/world/entity/monster/warden/WardenAi.java +index b1bca206a880f763c5e9234a20943e9918889b44..5fc0c82231f3407199f1bf0db8ac278e4b29d1e2 100644 --- a/net/minecraft/world/entity/monster/warden/WardenAi.java +++ b/net/minecraft/world/entity/monster/warden/WardenAi.java -@@ -175,15 +_,16 @@ +@@ -175,15 +175,16 @@ public class WardenAi { brain.addActivityAndRemoveMemoryWhenStopped( Activity.FIGHT, 10, diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/CatSpawner.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/npc/CatSpawner.java.patch similarity index 77% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/CatSpawner.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/npc/CatSpawner.java.patch index 6d573d3e2..d6df3ea10 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/CatSpawner.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/npc/CatSpawner.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/npc/CatSpawner.java b/net/minecraft/world/entity/npc/CatSpawner.java +index 08e91aab23f326213538bd97f28cbc818770eb04..554c4dbc36040bdcfb973d5826da1448fa09725c 100644 --- a/net/minecraft/world/entity/npc/CatSpawner.java +++ b/net/minecraft/world/entity/npc/CatSpawner.java -@@ -23,7 +_,7 @@ +@@ -23,7 +23,7 @@ public class CatSpawner implements CustomSpawner { public void tick(ServerLevel level, boolean spawnEnemies) { this.nextTick--; if (this.nextTick <= 0) { @@ -9,7 +17,7 @@ Player randomPlayer = level.getRandomPlayer(); if (randomPlayer != null) { RandomSource randomSource = level.random; -@@ -45,9 +_,12 @@ +@@ -45,9 +45,12 @@ public class CatSpawner implements CustomSpawner { } private void spawnInVillage(ServerLevel level, BlockPos pos) { @@ -25,7 +33,7 @@ if (entitiesOfClass.size() < 5) { this.spawnCat(pos, level, false); } -@@ -55,8 +_,11 @@ +@@ -55,8 +58,11 @@ public class CatSpawner implements CustomSpawner { } private void spawnInHut(ServerLevel level, BlockPos pos) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/Villager.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/npc/Villager.java.patch similarity index 85% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/Villager.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/npc/Villager.java.patch index f0dc4f5b5..698a66cd5 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/Villager.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/npc/Villager.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java +index d10a407bef7da29a24582e48d8ee599c981384c5..be8200024a766d338705ece9a7fe0cced53a299a 100644 --- a/net/minecraft/world/entity/npc/Villager.java +++ b/net/minecraft/world/entity/npc/Villager.java -@@ -179,6 +_,8 @@ +@@ -179,6 +179,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler MemoryModuleType.MEETING_POINT, (villager, poiType) -> poiType.is(PoiTypes.MEETING) ); @@ -9,7 +17,7 @@ public Villager(EntityType type, Level level) { this(type, level, VillagerType.PLAINS); -@@ -197,6 +_,57 @@ +@@ -197,6 +199,57 @@ public class Villager extends AbstractVillager implements ReputationEventHandler this.setVillagerData(this.getVillagerData().withType(villagerType).withProfession(level.registryAccess(), VillagerProfession.NONE)); } @@ -67,7 +75,7 @@ @Override public Brain getBrain() { return (Brain)super.getBrain(); -@@ -293,11 +_,22 @@ +@@ -293,11 +346,22 @@ public class Villager extends AbstractVillager implements ReputationEventHandler // Paper start - EAR 2 this.customServerAiStep(level, false); } @@ -92,7 +100,7 @@ profilerFiller.pop(); if (this.assignProfessionWhenSpawned) { this.assignProfessionWhenSpawned = false; -@@ -369,6 +_,7 @@ +@@ -369,6 +433,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler return InteractionResult.CONSUME; } @@ -100,7 +108,7 @@ this.startTrading(player); } -@@ -505,7 +_,7 @@ +@@ -505,7 +570,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler public void updateDemand() { for (MerchantOffer merchantOffer : this.getOffers()) { @@ -109,7 +117,7 @@ } } -@@ -698,7 +_,7 @@ +@@ -698,7 +763,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @Override public boolean canBreed() { @@ -118,7 +126,7 @@ } private boolean hungry() { -@@ -923,6 +_,7 @@ +@@ -923,6 +988,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler } public void spawnGolemIfNeeded(ServerLevel level, long gameTime, int minVillagerAmount) { @@ -126,7 +134,7 @@ if (this.wantsToSpawnGolem(gameTime)) { AABB aabb = this.getBoundingBox().inflate(10.0, 10.0, 10.0); List entitiesOfClass = level.getEntitiesOfClass(Villager.class, aabb); -@@ -990,6 +_,12 @@ +@@ -990,6 +1056,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @Override public void startSleeping(BlockPos pos) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/WanderingTrader.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/npc/WanderingTrader.java.patch similarity index 69% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/WanderingTrader.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/npc/WanderingTrader.java.patch index cb6fcbacd..b64807080 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/WanderingTrader.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/npc/WanderingTrader.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/npc/WanderingTrader.java b/net/minecraft/world/entity/npc/WanderingTrader.java +index 4c7287c4a081b4e1f0049c8c9bdf6a42b51e8274..4032215d5907b926d1a8e08a8b0852c1388b51c5 100644 --- a/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/net/minecraft/world/entity/npc/WanderingTrader.java -@@ -60,6 +_,13 @@ +@@ -60,6 +60,13 @@ public class WanderingTrader extends AbstractVillager implements Consumable.Over super(type, level); } @@ -14,7 +22,7 @@ @Override protected void registerGoals() { this.goalSelector.addGoal(0, new FloatGoal(this)); -@@ -80,7 +_,7 @@ +@@ -80,7 +87,7 @@ public class WanderingTrader extends AbstractVillager implements Consumable.Over this, new ItemStack(Items.MILK_BUCKET), SoundEvents.WANDERING_TRADER_REAPPEARED, @@ -23,7 +31,7 @@ ) ); this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this)); -@@ -124,8 +_,10 @@ +@@ -124,8 +131,10 @@ public class WanderingTrader extends AbstractVillager implements Consumable.Over return InteractionResult.CONSUME; } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/WanderingTraderSpawner.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/npc/WanderingTraderSpawner.java.patch similarity index 72% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/WanderingTraderSpawner.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/npc/WanderingTraderSpawner.java.patch index aa2bd45aa..917142f22 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/npc/WanderingTraderSpawner.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/npc/WanderingTraderSpawner.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/net/minecraft/world/entity/npc/WanderingTraderSpawner.java +index aafd89f37492c650fd10b478a353cc8b19d49a3f..3f10af7eb42c60b80f39ab090c65b6c1a089c4e0 100644 --- a/net/minecraft/world/entity/npc/WanderingTraderSpawner.java +++ b/net/minecraft/world/entity/npc/WanderingTraderSpawner.java -@@ -135,7 +_,17 @@ +@@ -135,7 +135,17 @@ public class WanderingTraderSpawner implements CustomSpawner { int i1 = pos.getX() + this.random.nextInt(maxDistance * 2) - maxDistance; int i2 = pos.getZ() + this.random.nextInt(maxDistance * 2) - maxDistance; int height = level.getHeight(Heightmap.Types.WORLD_SURFACE, i1, i2); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/player/Player.java.patch similarity index 83% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/player/Player.java.patch index 82c259aaf..5fb80b349 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/player/Player.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java +index 1c165c5d027899b6e9de8a6b731389dad11fb24c..45fe132e78147bb33d986d8098b6b12567b5398a 100644 --- a/net/minecraft/world/entity/player/Player.java +++ b/net/minecraft/world/entity/player/Player.java -@@ -181,11 +_,20 @@ +@@ -181,11 +181,20 @@ public abstract class Player extends Avatar implements ContainerUser { private int currentImpulseContextResetGraceTime = 0; public boolean affectsSpawning = true; // Paper - Affects Spawning API public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage @@ -21,7 +29,7 @@ @Override public org.bukkit.craftbukkit.entity.CraftHumanEntity getBukkitEntity() { return (org.bukkit.craftbukkit.entity.CraftHumanEntity) super.getBukkitEntity(); -@@ -247,6 +_,12 @@ +@@ -247,6 +256,12 @@ public abstract class Player extends Avatar implements ContainerUser { @Override public void tick() { @@ -34,7 +42,7 @@ this.noPhysics = this.isSpectator(); if (this.isSpectator() || this.isPassenger()) { this.setOnGround(false); -@@ -302,6 +_,17 @@ +@@ -302,6 +317,17 @@ public abstract class Player extends Avatar implements ContainerUser { this.turtleHelmetTick(); } @@ -52,7 +60,7 @@ this.cooldowns.tick(); this.updatePlayerPose(); if (this.currentImpulseContextResetGraceTime > 0) { -@@ -513,7 +_,7 @@ +@@ -513,7 +539,7 @@ public abstract class Player extends Avatar implements ContainerUser { List list = Lists.newArrayList(); for (Entity entity : entities) { @@ -61,7 +69,7 @@ list.add(entity); } else if (!entity.isRemoved()) { this.touch(entity); -@@ -1075,7 +_,7 @@ +@@ -1075,7 +1101,7 @@ public abstract class Player extends Avatar implements ContainerUser { flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper - Toggleable player crits if (flag2) { damageSource = damageSource.critical(); // Paper - critical damage API @@ -70,7 +78,7 @@ } float f2 = f + f1; -@@ -1675,7 +_,23 @@ +@@ -1675,7 +1701,23 @@ public abstract class Player extends Avatar implements ContainerUser { @Override protected int getBaseExperienceReward(ServerLevel level) { @@ -95,17 +103,17 @@ } @Override -@@ -1718,6 +_,13 @@ - public boolean addItem(ItemStack stack) { +@@ -1719,6 +1761,13 @@ public abstract class Player extends Avatar implements ContainerUser { return this.inventory.add(stack); } -+ + + // Purpur start - Player ridable in water option + @Override + public boolean dismountsUnderwater() { + return !level().purpurConfig.playerRidableInWater; + } + // Purpur end - Player ridable in water option - ++ @Nullable public abstract GameType gameMode(); + diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch similarity index 69% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch index 0ac5f2c2e..e6b8742db 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/projectile/AbstractArrow.java b/net/minecraft/world/entity/projectile/AbstractArrow.java +index 1be2a7f45866bfe69b8f181fee98d1336b0cfba3..2edd0d3818db2f433ce59f62576aa5c378a11693 100644 --- a/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/net/minecraft/world/entity/projectile/AbstractArrow.java -@@ -76,6 +_,7 @@ +@@ -76,6 +76,7 @@ public abstract class AbstractArrow extends Projectile { public ItemStack pickupItemStack = this.getDefaultPickupItem(); @Nullable public ItemStack firedFromWeapon = null; @@ -8,7 +16,7 @@ protected AbstractArrow(EntityType type, Level level) { super(type, level); -@@ -344,7 +_,7 @@ +@@ -344,7 +345,7 @@ public abstract class AbstractArrow extends Projectile { this.setInGround(false); Vec3 deltaMovement = this.getDeltaMovement(); this.setDeltaMovement(deltaMovement.multiply(this.random.nextFloat() * 0.2F, this.random.nextFloat() * 0.2F, this.random.nextFloat() * 0.2F)); @@ -17,16 +25,16 @@ } public boolean isInGround() { -@@ -568,6 +_,12 @@ - public ItemStack getWeaponItem() { +@@ -569,6 +570,12 @@ public abstract class AbstractArrow extends Projectile { return this.firedFromWeapon; } -+ + + // Purpur start - Add an option to fix MC-3304 projectile looting + public void setActualEnchantments(net.minecraft.world.item.enchantment.ItemEnchantments actualEnchantments) { + this.actualEnchantments = actualEnchantments; + } + // Purpur end - Add an option to fix MC-3304 projectile looting - ++ protected SoundEvent getDefaultHitGroundSoundEvent() { return SoundEvents.ARROW_HIT; + } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Snowball.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/Snowball.java.patch similarity index 85% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Snowball.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/Snowball.java.patch index 1f0d0f7dd..a1c28b52f 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Snowball.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/Snowball.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/projectile/Snowball.java b/net/minecraft/world/entity/projectile/Snowball.java +index cd36d3a988ae871fe93157c24c26f36308c71fbf..6e6e10140381b63f9833e704f5d35d7e74ac7e66 100644 --- a/net/minecraft/world/entity/projectile/Snowball.java +++ b/net/minecraft/world/entity/projectile/Snowball.java -@@ -53,9 +_,39 @@ +@@ -53,10 +53,40 @@ public class Snowball extends ThrowableItemProjectile { protected void onHitEntity(EntityHitResult result) { super.onHitEntity(result); Entity entity = result.getEntity(); @@ -8,7 +16,7 @@ + int i = entity.level().purpurConfig.snowballDamage >= 0 ? entity.level().purpurConfig.snowballDamage : entity instanceof Blaze ? 3 : 0; // Purpur - Add configurable snowball damage entity.hurt(this.damageSources().thrown(this, this.getOwner()), i); } -+ + + // Purpur start - options to extinguish fire blocks with snowballs - borrowed and modified code from ThrownPotion#onHitBlock and ThrownPotion#dowseFire + @Override + protected void onHitBlock(net.minecraft.world.phys.BlockHitResult blockHitResult) { @@ -38,6 +46,7 @@ + } + } + // Purpur end - options to extinguish fire blocks with snowballs - ++ @Override protected void onHit(HitResult result) { + super.onHit(result); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownEnderpearl.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/ThrownEnderpearl.java.patch similarity index 76% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownEnderpearl.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/ThrownEnderpearl.java.patch index 1db2d8c1b..f5ab14ae5 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownEnderpearl.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/ThrownEnderpearl.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java +index 108db190b7ae0798f8d590de11e1e271ec516788..9213d25928066ee6722f1a145ae37e99d6e62582 100644 --- a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java +++ b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java -@@ -114,9 +_,10 @@ +@@ -114,9 +114,10 @@ public class ThrownEnderpearl extends ThrowableItemProjectile { return; } // CraftBukkit end @@ -12,7 +20,7 @@ endermite.snapTo(preTeleportX, preTeleportY, preTeleportZ, preTeleportYRot, preTeleportXRot); // Paper - spawn endermite at pre teleport position as teleport has been moved up serverLevel.addFreshEntity(endermite, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.ENDER_PEARL); // Paper - add reason } -@@ -136,7 +_,7 @@ +@@ -136,7 +137,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile { if (serverPlayer1 != null) { serverPlayer1.resetFallDistance(); serverPlayer1.resetCurrentImpulseContext(); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownTrident.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/ThrownTrident.java.patch similarity index 63% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownTrident.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/ThrownTrident.java.patch index 7b1c6ed02..7d145f0df 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownTrident.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/ThrownTrident.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/projectile/ThrownTrident.java b/net/minecraft/world/entity/projectile/ThrownTrident.java +index b12d53af65a5defe11bfffdc08449e4726473de8..ee6f55f5079c803f8cff1dd06efa11f647afd460 100644 --- a/net/minecraft/world/entity/projectile/ThrownTrident.java +++ b/net/minecraft/world/entity/projectile/ThrownTrident.java -@@ -69,7 +_,7 @@ +@@ -69,7 +69,7 @@ public class ThrownTrident extends AbstractArrow { Entity owner = this.getOwner(); int i = this.entityData.get(ID_LOYALTY); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/WitherSkull.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/WitherSkull.java.patch similarity index 64% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/WitherSkull.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/WitherSkull.java.patch index c121d1c04..9c6c5cf11 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/WitherSkull.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/projectile/WitherSkull.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/projectile/WitherSkull.java b/net/minecraft/world/entity/projectile/WitherSkull.java +index 1384e95a9595f9ba9ce59737c635e23b3c1c4326..6787a48f8e06e95caa83e0aa7a6695cedfd6aca4 100644 --- a/net/minecraft/world/entity/projectile/WitherSkull.java +++ b/net/minecraft/world/entity/projectile/WitherSkull.java -@@ -94,7 +_,7 @@ +@@ -94,7 +94,7 @@ public class WitherSkull extends AbstractHurtingProjectile { super.onHit(result); if (!this.level().isClientSide()) { // CraftBukkit start @@ -9,17 +17,17 @@ if (event.callEvent()) { this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB); } -@@ -102,6 +_,13 @@ - this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause +@@ -103,6 +103,13 @@ public class WitherSkull extends AbstractHurtingProjectile { } } -+ + + // Purpur start - Add canSaveToDisk to Entity + @Override + public boolean canSaveToDisk() { + return false; + } + // Purpur end - Add canSaveToDisk to Entity - ++ @Override protected void defineSynchedData(SynchedEntityData.Builder builder) { + builder.define(DATA_DANGEROUS, false); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/raid/Raids.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/raid/Raids.java.patch similarity index 80% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/raid/Raids.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/raid/Raids.java.patch index ff8ffc2c8..1a5ed004c 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/raid/Raids.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/raid/Raids.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/raid/Raids.java b/net/minecraft/world/entity/raid/Raids.java +index 870479811375677c1c1b7faae0c2d9fdef89cb72..cdc862e3721f4ef05be302cb0a1e0f8965ddbb1b 100644 --- a/net/minecraft/world/entity/raid/Raids.java +++ b/net/minecraft/world/entity/raid/Raids.java -@@ -30,6 +_,7 @@ +@@ -30,6 +30,7 @@ import net.minecraft.world.phys.Vec3; public class Raids extends SavedData { private static final String RAID_FILE_ID = "raids"; @@ -8,7 +16,7 @@ public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group( Raids.RaidWithId.CODEC -@@ -82,6 +_,17 @@ +@@ -82,6 +83,17 @@ public class Raids extends SavedData { public void tick(ServerLevel level) { this.tick++; @@ -26,7 +34,7 @@ Iterator iterator = this.raidMap.values().iterator(); while (iterator.hasNext()) { -@@ -147,11 +_,13 @@ +@@ -147,11 +159,13 @@ public class Raids extends SavedData { // } if (!raid.isStarted() || (raid.isInProgress() && raid.getRaidOmenLevel() < raid.getMaxRaidOmenLevel())) { // CraftBukkit - fixed a bug with raid: players could add up Bad Omen level even when the raid had finished diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch similarity index 51% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch index 5543ef97b..4faedfada 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/vehicle/AbstractBoat.java b/net/minecraft/world/entity/vehicle/AbstractBoat.java +index adab5dc640a7a0299c04020225a68317282aebe9..2e8b923a97ed33ecc2802a0ac452e86e9f397bda 100644 --- a/net/minecraft/world/entity/vehicle/AbstractBoat.java +++ b/net/minecraft/world/entity/vehicle/AbstractBoat.java -@@ -432,6 +_,7 @@ +@@ -432,6 +432,7 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable { float groundFriction = this.getGroundFriction(); if (groundFriction > 0.0F) { this.landFriction = groundFriction; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java.patch similarity index 62% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java.patch index dfb044e11..ead97abc8 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java b/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java +index 090b19752fbfc856d9fbf118510afc6cda2b9989..325ec57df2885f5e81b8a6b61e3a9fed9484b30f 100644 --- a/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java +++ b/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java -@@ -391,7 +_,7 @@ +@@ -391,7 +391,7 @@ public class NewMinecartBehavior extends MinecartBehavior { private Vec3 calculateBoostTrackSpeed(Vec3 speed, BlockPos pos, BlockState state) { if (state.is(Blocks.POWERED_RAIL) && state.getValue(PoweredRailBlock.POWERED)) { if (speed.length() > 0.01) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java.patch similarity index 65% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java.patch index c8d066068..5f6805f5e 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java b/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java +index 0c68ac49780724e32f982fb259f5e3cbf6d50bdd..3cd5c5c753483390ae00e5d55f1fdaca82490e56 100644 --- a/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java +++ b/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java -@@ -243,8 +_,8 @@ +@@ -243,8 +243,8 @@ public class OldMinecartBehavior extends MinecartBehavior { Vec3 deltaMovement1 = this.getDeltaMovement(); double d13 = deltaMovement1.horizontalDistance(); if (d13 > 0.01) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/food/FoodData.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/food/FoodData.java.patch similarity index 75% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/food/FoodData.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/food/FoodData.java.patch index a44cdd312..2f12c2dc4 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/food/FoodData.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/food/FoodData.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/food/FoodData.java b/net/minecraft/world/food/FoodData.java +index 41d1a0d5e8d6564b179757d7e5e132dc39174a47..8f9386dc0e71dca72c7a613dd24892b37f66e38e 100644 --- a/net/minecraft/world/food/FoodData.java +++ b/net/minecraft/world/food/FoodData.java -@@ -39,6 +_,7 @@ +@@ -39,6 +39,7 @@ public class FoodData { int oldFoodLevel = this.foodLevel; org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(serverPlayer, foodProperties.nutrition() + oldFoodLevel, stack); if (!event.isCancelled()) { @@ -8,7 +16,7 @@ this.add(event.getFoodLevel() - oldFoodLevel, foodProperties.saturation()); } serverPlayer.getBukkitEntity().sendHealthUpdate(); -@@ -87,7 +_,7 @@ +@@ -87,7 +88,7 @@ public class FoodData { this.tickTimer++; if (this.tickTimer >= this.starvationRate) { // CraftBukkit - add regen rate manipulation if (player.getHealth() > 10.0F || difficulty == Difficulty.HARD || player.getHealth() > 1.0F && difficulty == Difficulty.NORMAL) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/food/FoodProperties.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/food/FoodProperties.java.patch similarity index 66% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/food/FoodProperties.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/food/FoodProperties.java.patch index 87515c815..b0e0b6e1d 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/food/FoodProperties.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/food/FoodProperties.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/food/FoodProperties.java b/net/minecraft/world/food/FoodProperties.java +index 793e4528755fa5688efbad75418188e693ad0157..20f702c8266eb54a8835861188eb937f4732e078 100644 --- a/net/minecraft/world/food/FoodProperties.java +++ b/net/minecraft/world/food/FoodProperties.java -@@ -42,9 +_,11 @@ +@@ -42,9 +42,11 @@ public record FoodProperties(int nutrition, float saturation, boolean canAlwaysE level.playSound(null, entity.getX(), entity.getY(), entity.getZ(), consumable.sound().value(), SoundSource.NEUTRAL, 1.0F, random.triangle(1.0F, 0.4F)); if (entity instanceof Player player) { player.getFoodData().eat(this, stack, (net.minecraft.server.level.ServerPlayer) player); // CraftBukkit diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch new file mode 100644 index 000000000..8de8a004c --- /dev/null +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch @@ -0,0 +1,18 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java +index 670090c4466d6472a83263e1769f19e3e491c927..276b5e6ac82e6e55e0a19c25a7c966501aeaba44 100644 +--- a/net/minecraft/world/inventory/AbstractContainerMenu.java ++++ b/net/minecraft/world/inventory/AbstractContainerMenu.java +@@ -65,6 +65,7 @@ public abstract class AbstractContainerMenu { + @Nullable + private ContainerSynchronizer synchronizer; + private boolean suppressRemoteUpdates; ++ @Nullable protected ItemStack activeQuickItem = null; // Purpur - Anvil API + // CraftBukkit start + public boolean checkReachable = true; + public abstract org.bukkit.inventory.InventoryView getBukkitView(); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractFurnaceMenu.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/AbstractFurnaceMenu.java.patch similarity index 64% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractFurnaceMenu.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/AbstractFurnaceMenu.java.patch index 41fe20831..a3b078a6a 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractFurnaceMenu.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/AbstractFurnaceMenu.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/inventory/AbstractFurnaceMenu.java b/net/minecraft/world/inventory/AbstractFurnaceMenu.java +index 6e13b05ebd924d98066624d9ff6ee7f61e248617..9304bc239ffafbef3b34c5a5a42039c86acd5e80 100644 --- a/net/minecraft/world/inventory/AbstractFurnaceMenu.java +++ b/net/minecraft/world/inventory/AbstractFurnaceMenu.java -@@ -121,7 +_,13 @@ +@@ -121,7 +121,13 @@ public abstract class AbstractFurnaceMenu extends RecipeBookMenu { } else if (slotIndex != 1 && slotIndex != 0) { if (this.canSmelt(item)) { if (!this.moveItemStackTo(item, 0, 1, false)) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AnvilMenu.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/AnvilMenu.java.patch similarity index 92% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AnvilMenu.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/AnvilMenu.java.patch index 7c93cca5f..0f0d97439 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AnvilMenu.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/AnvilMenu.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/inventory/AnvilMenu.java b/net/minecraft/world/inventory/AnvilMenu.java +index 9a3887752aa4b39224c9bf6e6145e20fa6962439..2f79a98ebc6a058e139c6b1e7aa38cd8f26c1a88 100644 --- a/net/minecraft/world/inventory/AnvilMenu.java +++ b/net/minecraft/world/inventory/AnvilMenu.java -@@ -23,6 +_,12 @@ +@@ -23,6 +23,12 @@ import net.minecraft.world.level.block.LevelEvent; import net.minecraft.world.level.block.state.BlockState; import org.slf4j.Logger; @@ -13,7 +21,7 @@ public class AnvilMenu extends ItemCombinerMenu { public static final int INPUT_SLOT = 0; public static final int ADDITIONAL_SLOT = 1; -@@ -52,6 +_,10 @@ +@@ -52,6 +58,10 @@ public class AnvilMenu extends ItemCombinerMenu { private org.bukkit.craftbukkit.inventory.view.CraftAnvilView bukkitEntity; // CraftBukkit end public boolean bypassEnchantmentLevelRestriction = false; // Paper - bypass anvil level restrictions @@ -24,7 +32,7 @@ public AnvilMenu(int containerId, Inventory playerInventory) { this(containerId, playerInventory, ContainerLevelAccess.NULL); -@@ -77,12 +_,17 @@ +@@ -77,12 +87,17 @@ public class AnvilMenu extends ItemCombinerMenu { @Override protected boolean mayPickup(Player player, boolean hasStack) { @@ -43,7 +51,7 @@ player.giveExperienceLevels(-this.cost.get()); } -@@ -135,13 +_,19 @@ +@@ -135,13 +150,19 @@ public class AnvilMenu extends ItemCombinerMenu { @Override public void createResult() { @@ -64,7 +72,7 @@ ItemStack itemStack = item.copy(); ItemStack item1 = this.inputSlots.getItem(1); ItemEnchantments.Mutable mutable = new ItemEnchantments.Mutable(EnchantmentHelper.getEnchantmentsForCrafting(itemStack)); -@@ -199,23 +_,34 @@ +@@ -199,23 +220,34 @@ public class AnvilMenu extends ItemCombinerMenu { int intValue = entry.getIntValue(); intValue = level == intValue ? intValue + 1 : Math.max(intValue, level); Enchantment enchantment = holder.value(); @@ -103,7 +111,7 @@ intValue = enchantment.getMaxLevel(); } -@@ -244,6 +_,54 @@ +@@ -244,6 +276,54 @@ public class AnvilMenu extends ItemCombinerMenu { if (!this.itemName.equals(item.getHoverName().getString())) { i1 = 1; i += i1; @@ -158,7 +166,7 @@ itemStack.set(DataComponents.CUSTOM_NAME, Component.literal(this.itemName)); } } else if (item.has(DataComponents.CUSTOM_NAME)) { -@@ -268,6 +_,12 @@ +@@ -268,6 +348,12 @@ public class AnvilMenu extends ItemCombinerMenu { this.onlyRenaming = true; } @@ -171,7 +179,7 @@ if (this.cost.get() >= this.maximumRepairCost && !this.player.hasInfiniteMaterials()) { // CraftBukkit itemStack = ItemStack.EMPTY; } -@@ -288,6 +_,13 @@ +@@ -288,6 +374,13 @@ public class AnvilMenu extends ItemCombinerMenu { org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(this.getBukkitView(), itemStack); // CraftBukkit this.broadcastChanges(); @@ -185,7 +193,7 @@ } else { org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(this.getBukkitView(), ItemStack.EMPTY); // CraftBukkit this.cost.set(AnvilMenu.DEFAULT_DENIED_COST); // CraftBukkit - use a variable for set a cost for denied item -@@ -296,7 +_,7 @@ +@@ -296,7 +389,7 @@ public class AnvilMenu extends ItemCombinerMenu { } public static int calculateIncreasedRepairCost(int oldRepairCost) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/ArmorSlot.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/ArmorSlot.java.patch similarity index 62% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/ArmorSlot.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/ArmorSlot.java.patch index 2b2579163..545fb96bc 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/ArmorSlot.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/ArmorSlot.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/inventory/ArmorSlot.java b/net/minecraft/world/inventory/ArmorSlot.java +index 0a440ea37d14cd840cf87a99264ace5ccde7c073..dec920727401de7f5bcc6c7e50f9dd325367ee90 100644 --- a/net/minecraft/world/inventory/ArmorSlot.java +++ b/net/minecraft/world/inventory/ArmorSlot.java -@@ -47,7 +_,7 @@ +@@ -47,7 +47,7 @@ class ArmorSlot extends Slot { @Override public boolean mayPickup(Player player) { ItemStack item = this.getItem(); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/EnchantmentMenu.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/EnchantmentMenu.java.patch similarity index 79% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/EnchantmentMenu.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/EnchantmentMenu.java.patch index 4996e388d..d05a4b93f 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/EnchantmentMenu.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/EnchantmentMenu.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/inventory/EnchantmentMenu.java b/net/minecraft/world/inventory/EnchantmentMenu.java +index ca02ff1180273e9018f042a1621b15af25f2b84e..e78e200f7b6f42399d0001d6a4e9a1d7e3743a24 100644 --- a/net/minecraft/world/inventory/EnchantmentMenu.java +++ b/net/minecraft/world/inventory/EnchantmentMenu.java -@@ -63,6 +_,22 @@ +@@ -63,6 +63,22 @@ public class EnchantmentMenu extends AbstractContainerMenu { return access.getLocation(); } // CraftBukkit end @@ -23,7 +31,7 @@ }; // Paper end - Add missing InventoryHolders this.access = access; -@@ -83,6 +_,16 @@ +@@ -83,6 +99,16 @@ public class EnchantmentMenu extends AbstractContainerMenu { return EnchantmentMenu.EMPTY_SLOT_LAPIS_LAZULI; } }); @@ -40,7 +48,7 @@ this.addStandardInventorySlots(playerInventory, 8, 84); this.addDataSlot(DataSlot.shared(this.costs, 0)); this.addDataSlot(DataSlot.shared(this.costs, 1)); -@@ -299,7 +_,7 @@ +@@ -299,7 +325,7 @@ public class EnchantmentMenu extends AbstractContainerMenu { @Override public void removed(Player player) { super.removed(player); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/GrindstoneMenu.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/GrindstoneMenu.java.patch similarity index 89% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/GrindstoneMenu.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/GrindstoneMenu.java.patch index f1ba2081a..d4d550876 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/GrindstoneMenu.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/GrindstoneMenu.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/inventory/GrindstoneMenu.java b/net/minecraft/world/inventory/GrindstoneMenu.java +index ad70a0f7debee27d9f3b2ff39cb0429b39485190..e991ca16d069fddc3e4eb6d8c78c0dbffeb75a54 100644 --- a/net/minecraft/world/inventory/GrindstoneMenu.java +++ b/net/minecraft/world/inventory/GrindstoneMenu.java -@@ -92,11 +_,13 @@ +@@ -92,11 +92,13 @@ public class GrindstoneMenu extends AbstractContainerMenu { @Override public void onTake(Player player, ItemStack stack) { access.execute((level, blockPos) -> { @@ -15,7 +23,7 @@ // Paper end - Fire BlockExpEvent on grindstone use } -@@ -125,7 +_,7 @@ +@@ -125,7 +127,7 @@ public class GrindstoneMenu extends AbstractContainerMenu { for (Entry> entry : enchantmentsForCrafting.entrySet()) { Holder holder = entry.getKey(); int intValue = entry.getIntValue(); @@ -24,7 +32,7 @@ i += holder.value().getMinCost(intValue); } } -@@ -203,15 +_,75 @@ +@@ -203,15 +205,75 @@ public class GrindstoneMenu extends AbstractContainerMenu { for (Entry> entry : enchantmentsForCrafting.entrySet()) { Holder holder = entry.getKey(); @@ -102,7 +110,7 @@ if (item.is(Items.ENCHANTED_BOOK) && itemEnchantments.isEmpty()) { item = item.transmuteCopy(Items.BOOK); } -@@ -223,6 +_,23 @@ +@@ -223,6 +285,23 @@ public class GrindstoneMenu extends AbstractContainerMenu { } item.set(DataComponents.REPAIR_COST, i); @@ -126,7 +134,7 @@ return item; } -@@ -279,7 +_,9 @@ +@@ -279,7 +358,9 @@ public class GrindstoneMenu extends AbstractContainerMenu { return ItemStack.EMPTY; } diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/ItemCombinerMenu.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/ItemCombinerMenu.java.patch new file mode 100644 index 000000000..3c6de9025 --- /dev/null +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/inventory/ItemCombinerMenu.java.patch @@ -0,0 +1,20 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/inventory/ItemCombinerMenu.java b/net/minecraft/world/inventory/ItemCombinerMenu.java +index 2cc21a907aa4acba408478842bcbdefb3dd4dffc..08d5f00712810a16a49aaa0fffec1fdf524b1b95 100644 +--- a/net/minecraft/world/inventory/ItemCombinerMenu.java ++++ b/net/minecraft/world/inventory/ItemCombinerMenu.java +@@ -155,7 +155,9 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu { + return ItemStack.EMPTY; + } + ++ this.activeQuickItem = itemStack; // Purpur - Anvil API + slot.onTake(player, item); ++ this.activeQuickItem = null; // Purpur - Anvil API + } + + return itemStack; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/AxeItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/AxeItem.java.patch similarity index 90% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/AxeItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/AxeItem.java.patch index 91c2180ca..e609cad2f 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/AxeItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/AxeItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/AxeItem.java b/net/minecraft/world/item/AxeItem.java +index 0549d808abaa626dc33df243b9493a6be90500e2..57ad7c438353aa4d0589894a7cab0554d9758c56 100644 --- a/net/minecraft/world/item/AxeItem.java +++ b/net/minecraft/world/item/AxeItem.java -@@ -65,13 +_,15 @@ +@@ -65,13 +65,15 @@ public class AxeItem extends Item { if (playerHasBlockingItemUseIntent(context)) { return InteractionResult.PASS; } else { @@ -18,7 +26,7 @@ return InteractionResult.PASS; } // Paper end -@@ -79,8 +_,15 @@ +@@ -79,8 +81,15 @@ public class AxeItem extends Item { CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger((ServerPlayer)player, clickedPos, itemInHand); } @@ -36,7 +44,7 @@ if (player != null) { itemInHand.hurtAndBreak(1, player, context.getHand().asEquipmentSlot()); } -@@ -97,21 +_,23 @@ +@@ -97,21 +106,23 @@ public class AxeItem extends Item { && !player.isSecondaryUseActive(); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BlockItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/BlockItem.java.patch similarity index 79% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/BlockItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/BlockItem.java.patch index 54652a635..1051e8c8a 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BlockItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/BlockItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java +index 10530a630e4dbb100eef195944dd3bee7a4e70e1..47a73c71396c7302175257670d4a7a5c5d8d20af 100644 --- a/net/minecraft/world/item/BlockItem.java +++ b/net/minecraft/world/item/BlockItem.java -@@ -143,7 +_,16 @@ +@@ -143,7 +143,16 @@ public class BlockItem extends Item { } protected boolean updateCustomBlockEntityTag(BlockPos pos, Level level, @Nullable Player player, ItemStack stack, BlockState state) { @@ -18,7 +26,7 @@ } @Nullable -@@ -205,6 +_,7 @@ +@@ -205,6 +214,7 @@ public class BlockItem extends Item { } if (!type.onlyOpCanSetNbt() || player != null && (player.canUseGameMasterBlocks() || (player.getAbilities().instabuild && player.getBukkitEntity().hasPermission("minecraft.nbt.place")))) { // Spigot - add permission @@ -26,7 +34,7 @@ return typedEntityData.loadInto(blockEntity, level.registryAccess()); } -@@ -245,6 +_,7 @@ +@@ -245,6 +255,7 @@ public class BlockItem extends Item { public void onDestroyed(ItemEntity itemEntity) { ItemContainerContents itemContainerContents = itemEntity.getItem().set(DataComponents.CONTAINER, ItemContainerContents.EMPTY); if (itemContainerContents != null) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BowItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/BowItem.java.patch similarity index 78% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/BowItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/BowItem.java.patch index bb43e3ee4..2b3dd622e 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BowItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/BowItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/BowItem.java b/net/minecraft/world/item/BowItem.java +index c4c8775de328d40bb8218d993872be5249e8174d..ce1ce18410fc1d47d999c918a8f880b43bf9797c 100644 --- a/net/minecraft/world/item/BowItem.java +++ b/net/minecraft/world/item/BowItem.java -@@ -28,6 +_,11 @@ +@@ -28,6 +28,11 @@ public class BowItem extends ProjectileWeaponItem { return false; } else { ItemStack projectile = player.getProjectile(stack); @@ -12,7 +20,7 @@ if (projectile.isEmpty()) { return false; } else { -@@ -38,7 +_,7 @@ +@@ -38,7 +43,7 @@ public class BowItem extends ProjectileWeaponItem { } else { List list = draw(stack, projectile, player); if (level instanceof ServerLevel serverLevel && !list.isEmpty()) { @@ -21,7 +29,7 @@ } level.playSound( -@@ -89,7 +_,7 @@ +@@ -89,7 +94,7 @@ public class BowItem extends ProjectileWeaponItem { public InteractionResult use(Level level, Player player, InteractionHand hand) { ItemStack itemInHand = player.getItemInHand(hand); boolean flag = !player.getProjectile(itemInHand).isEmpty(); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BucketItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/BucketItem.java.patch similarity index 69% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/BucketItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/BucketItem.java.patch index a8713bde6..768c88cd8 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/BucketItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/BucketItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/BucketItem.java b/net/minecraft/world/item/BucketItem.java +index d27e680993fb3ae18a0bdf09ec7b176551bb015b..1534b142bf8188df0ef6652e39768e0a0c88bcf2 100644 --- a/net/minecraft/world/item/BucketItem.java +++ b/net/minecraft/world/item/BucketItem.java -@@ -147,7 +_,7 @@ +@@ -147,7 +147,7 @@ public class BucketItem extends Item implements DispensibleContainerItem { // CraftBukkit end if (!flag2) { return hitResult != null && this.emptyContents(entity, level, hitResult.getBlockPos().relative(hitResult.getDirection()), null, direction, clicked, itemstack, hand); // CraftBukkit @@ -9,7 +17,7 @@ int x = pos.getX(); int y = pos.getY(); int z = pos.getZ(); -@@ -156,7 +_,7 @@ +@@ -156,7 +156,7 @@ public class BucketItem extends Item implements DispensibleContainerItem { ); for (int i = 0; i < 8; i++) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/CrossbowItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/CrossbowItem.java.patch similarity index 63% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/CrossbowItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/CrossbowItem.java.patch index c2e3f0e41..325aa13a7 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/CrossbowItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/CrossbowItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/CrossbowItem.java b/net/minecraft/world/item/CrossbowItem.java +index 576b87ed90e620a19ccb5931c9a23a72243a8bbd..c4279f25223eacbb708134b4562c0cd042161a30 100644 --- a/net/minecraft/world/item/CrossbowItem.java +++ b/net/minecraft/world/item/CrossbowItem.java -@@ -66,7 +_,7 @@ +@@ -66,7 +66,7 @@ public class CrossbowItem extends ProjectileWeaponItem { ItemStack itemInHand = player.getItemInHand(hand); ChargedProjectiles chargedProjectiles = itemInHand.get(DataComponents.CHARGED_PROJECTILES); if (chargedProjectiles != null && !chargedProjectiles.isEmpty()) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/DyeColor.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/DyeColor.java.patch similarity index 55% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/DyeColor.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/DyeColor.java.patch index e53cc098b..ccc19bfc0 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/DyeColor.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/DyeColor.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/DyeColor.java b/net/minecraft/world/item/DyeColor.java +index cc828a7f7eeb22ce37fc4ca2fe8b68e70a206b61..fe71f28c0273a23ba6f798eacd6f9a6a8e36ec9b 100644 --- a/net/minecraft/world/item/DyeColor.java +++ b/net/minecraft/world/item/DyeColor.java -@@ -126,4 +_,10 @@ +@@ -126,4 +126,10 @@ public enum DyeColor implements StringRepresentable { private static CraftingInput makeCraftColorInput(DyeColor first, DyeColor second) { return CraftingInput.of(2, 1, List.of(new ItemStack(DyeItem.byColor(first)), new ItemStack(DyeItem.byColor(second)))); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EggItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/EggItem.java.patch similarity index 72% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/EggItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/EggItem.java.patch index 7bd1d11bf..6fb803fbe 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EggItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/EggItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/EggItem.java b/net/minecraft/world/item/EggItem.java +index 2dc15a06572401c22fa4b8009fa1cdc3ceef0473..75ce17c1fa8c74981c44f3dab7e82351eef3b2f3 100644 --- a/net/minecraft/world/item/EggItem.java +++ b/net/minecraft/world/item/EggItem.java -@@ -24,7 +_,7 @@ +@@ -24,7 +24,7 @@ public class EggItem extends Item implements ProjectileItem { public InteractionResult use(Level level, Player player, InteractionHand hand) { ItemStack itemInHand = player.getItemInHand(hand); // Paper start diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EndCrystalItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/EndCrystalItem.java.patch similarity index 60% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/EndCrystalItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/EndCrystalItem.java.patch index baee5e0ab..ead64194e 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EndCrystalItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/EndCrystalItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/EndCrystalItem.java b/net/minecraft/world/item/EndCrystalItem.java +index 05ec512839898f96d9769bb0d00f6ba11dda0c4b..6e4a3c9c090a68bf5785a01d815c275411859c7b 100644 --- a/net/minecraft/world/item/EndCrystalItem.java +++ b/net/minecraft/world/item/EndCrystalItem.java -@@ -24,7 +_,7 @@ +@@ -24,7 +24,7 @@ public class EndCrystalItem extends Item { Level level = context.getLevel(); BlockPos clickedPos = context.getClickedPos(); BlockState blockState = level.getBlockState(clickedPos); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EnderpearlItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/EnderpearlItem.java.patch similarity index 78% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/EnderpearlItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/EnderpearlItem.java.patch index de340dafe..ea6d1df10 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/EnderpearlItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/EnderpearlItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/EnderpearlItem.java b/net/minecraft/world/item/EnderpearlItem.java +index 0b4464b23a85c237026b31ab224f599fea42d2ee..411ddda1003ac1b9bb75735154ffe8996ab8b6f3 100644 --- a/net/minecraft/world/item/EnderpearlItem.java +++ b/net/minecraft/world/item/EnderpearlItem.java -@@ -24,7 +_,7 @@ +@@ -24,7 +24,7 @@ public class EnderpearlItem extends Item { if (level instanceof ServerLevel serverLevel) { // CraftBukkit start // Paper start - PlayerLaunchProjectileEvent @@ -9,7 +17,7 @@ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) player.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemInHand), (org.bukkit.entity.Projectile) thrownEnderpearl.projectile().getBukkitEntity()); if (event.callEvent() && thrownEnderpearl.attemptSpawn()) { if (event.shouldConsume()) { -@@ -44,6 +_,7 @@ +@@ -44,6 +44,7 @@ public class EnderpearlItem extends Item { 0.4F / (level.getRandom().nextFloat() * 0.4F + 0.8F) ); player.awardStat(Stats.ITEM_USED.get(this)); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/HoeItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/HoeItem.java.patch similarity index 82% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/HoeItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/HoeItem.java.patch index cfe01d6ad..75ba78db6 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/HoeItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/HoeItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/HoeItem.java b/net/minecraft/world/item/HoeItem.java +index d9d03bfcb1cb10aa03b35255c4237760bc836752..bf14cbcc6ed4c89ef6f15b3cb248a599cbc26e29 100644 --- a/net/minecraft/world/item/HoeItem.java +++ b/net/minecraft/world/item/HoeItem.java -@@ -44,15 +_,25 @@ +@@ -44,15 +44,25 @@ public class HoeItem extends Item { public InteractionResult useOn(UseOnContext context) { Level level = context.getLevel(); BlockPos clickedPos = context.getClickedPos(); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/ItemStack.java.patch similarity index 78% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/ItemStack.java.patch index 84f9c2fe1..71ed4eda9 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/ItemStack.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java +index 47862c00e9e01c7cdd5fcd808cc1b76740b85a57..b367b94ba6977b94c7f46c9f02ed6c3fc5284185 100644 --- a/net/minecraft/world/item/ItemStack.java +++ b/net/minecraft/world/item/ItemStack.java -@@ -451,6 +_,7 @@ +@@ -451,6 +451,7 @@ public final class ItemStack implements DataComponentHolder { // revert back all captured blocks for (org.bukkit.block.BlockState blockstate : blocks) { ((org.bukkit.craftbukkit.block.CraftBlockState) blockstate).revertPlace(); @@ -8,7 +16,7 @@ } SignItem.openSign = null; // SPIGOT-6758 - Reset on early return -@@ -474,6 +_,7 @@ +@@ -474,6 +475,7 @@ public final class ItemStack implements DataComponentHolder { if (!(block.getBlock() instanceof net.minecraft.world.level.block.BaseEntityBlock)) { // Containers get placed automatically block.onPlace(serverLevel, newPos, oldBlock, true, context); } @@ -16,7 +24,7 @@ serverLevel.notifyAndUpdatePhysics(newPos, null, oldBlock, block, serverLevel.getBlockState(newPos), updateFlags, net.minecraft.world.level.block.Block.UPDATE_LIMIT); // send null chunk as chunk.k() returns false by this point } -@@ -594,6 +_,26 @@ +@@ -594,6 +596,26 @@ public final class ItemStack implements DataComponentHolder { return this.isDamageableItem() && this.getDamageValue() > 0; } @@ -43,16 +51,16 @@ public int getDamageValue() { return Mth.clamp(this.getOrDefault(DataComponents.DAMAGE, 0), 0, this.getMaxDamage()); } -@@ -1209,6 +_,12 @@ - public boolean isEnchanted() { +@@ -1210,6 +1232,12 @@ public final class ItemStack implements DataComponentHolder { return !this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY).isEmpty(); } -+ + + // Purpur start - Config to allow unsafe enchants + public boolean hasEnchantment(Holder enchantment) { + return this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY).getLevel(enchantment) > 0; + } + // Purpur end - Config to allow unsafe enchants - ++ public ItemEnchantments getEnchantments() { return this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY); + } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/Items.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/Items.java.patch similarity index 78% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/Items.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/Items.java.patch index 05befcd61..912e77821 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/Items.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/Items.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/Items.java b/net/minecraft/world/item/Items.java +index b37550fff62d07aab1a9bc955dcba6418f9f440c..9fdf823c0bb04965897b9775668d7ad73a3adfc0 100644 --- a/net/minecraft/world/item/Items.java +++ b/net/minecraft/world/item/Items.java -@@ -420,7 +_,7 @@ +@@ -420,7 +420,7 @@ public class Items { public static final Item PURPUR_BLOCK = registerBlock(Blocks.PURPUR_BLOCK); public static final Item PURPUR_PILLAR = registerBlock(Blocks.PURPUR_PILLAR); public static final Item PURPUR_STAIRS = registerBlock(Blocks.PURPUR_STAIRS); @@ -9,7 +17,7 @@ public static final Item CREAKING_HEART = registerBlock(Blocks.CREAKING_HEART); public static final Item CHEST = registerBlock(Blocks.CHEST, properties -> properties.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY)); public static final Item CRAFTING_TABLE = registerBlock(Blocks.CRAFTING_TABLE); -@@ -2178,7 +_,7 @@ +@@ -2178,7 +2178,7 @@ public class Items { "sweet_berries", createBlockItemWithCustomItemName(Blocks.SWEET_BERRY_BUSH), new Item.Properties().food(Foods.SWEET_BERRIES) ); public static final Item GLOW_BERRIES = registerItem( diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/MapItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/MapItem.java.patch similarity index 53% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/MapItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/MapItem.java.patch index 26cb87e2f..381cc2e9d 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/MapItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/MapItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/MapItem.java b/net/minecraft/world/item/MapItem.java +index c64e2abefb8319c16d142ee44479c4965a47d98f..27efca58d7ebe5df8f117160c0e809ec50dd78d3 100644 --- a/net/minecraft/world/item/MapItem.java +++ b/net/minecraft/world/item/MapItem.java -@@ -194,6 +_,7 @@ +@@ -194,6 +194,7 @@ public class MapItem extends Item { public static void renderBiomePreviewMap(ServerLevel level, ItemStack stack) { MapItemSavedData savedData = getSavedData(stack, level); if (savedData != null) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/NameTagItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/NameTagItem.java.patch similarity index 64% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/NameTagItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/NameTagItem.java.patch index 2a8639361..a00564785 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/NameTagItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/NameTagItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/NameTagItem.java b/net/minecraft/world/item/NameTagItem.java +index 24bf4cd320c67b852d3905c50740c8006592bd68..7ee4bd968a43123e21e65f77f30495e65146aca5 100644 --- a/net/minecraft/world/item/NameTagItem.java +++ b/net/minecraft/world/item/NameTagItem.java -@@ -24,6 +_,7 @@ +@@ -24,6 +24,7 @@ public class NameTagItem extends Item { LivingEntity newEntity = ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getEntity()).getHandle(); newEntity.setCustomName(event.getName() != null ? io.papermc.paper.adventure.PaperAdventure.asVanilla(event.getName()) : null); diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/ProjectileWeaponItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/ProjectileWeaponItem.java.patch new file mode 100644 index 000000000..586d94e9c --- /dev/null +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/ProjectileWeaponItem.java.patch @@ -0,0 +1,19 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/ProjectileWeaponItem.java b/net/minecraft/world/item/ProjectileWeaponItem.java +index 663826d7e26bf647376eacbf0c6a2bb80bbdf55a..aa1cf1653d33cd35f77db28dbee0c2319e1975f3 100644 +--- a/net/minecraft/world/item/ProjectileWeaponItem.java ++++ b/net/minecraft/world/item/ProjectileWeaponItem.java +@@ -106,6 +106,8 @@ public abstract class ProjectileWeaponItem extends Item { + abstractArrow.setCritArrow(true); + } + ++ abstractArrow.setActualEnchantments(weapon.getEnchantments()); // Purpur - Add an option to fix MC-3304 projectile looting ++ + return abstractArrow; + } + diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ShovelItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/ShovelItem.java.patch similarity index 74% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/ShovelItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/ShovelItem.java.patch index c583f3853..dce59c4b8 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ShovelItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/ShovelItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/ShovelItem.java b/net/minecraft/world/item/ShovelItem.java +index ba0609f4d9166e66599f9d4430885ab03d53ef41..7910c96cc47985acc8b64ba376933c84c51022d4 100644 --- a/net/minecraft/world/item/ShovelItem.java +++ b/net/minecraft/world/item/ShovelItem.java -@@ -46,9 +_,12 @@ +@@ -46,9 +46,12 @@ public class ShovelItem extends Item { BlockState blockState1 = FLATTENABLES.get(blockState.getBlock()); BlockState blockState2 = null; Runnable afterAction = null; // Paper diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/SnowballItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/SnowballItem.java.patch similarity index 72% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/SnowballItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/SnowballItem.java.patch index 9c09ecb72..78a3bb34c 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/SnowballItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/SnowballItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/SnowballItem.java b/net/minecraft/world/item/SnowballItem.java +index bef1a8faa8e9567c9707ffb2b34c278c75581e35..fa3a9501134226f269882a14900b924df7d25046 100644 --- a/net/minecraft/world/item/SnowballItem.java +++ b/net/minecraft/world/item/SnowballItem.java -@@ -26,7 +_,7 @@ +@@ -26,7 +26,7 @@ public class SnowballItem extends Item implements ProjectileItem { // CraftBukkit start - moved down if (level instanceof ServerLevel serverLevel) { // Paper start - PlayerLaunchProjectileEvent diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/SpawnEggItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/SpawnEggItem.java.patch similarity index 84% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/SpawnEggItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/SpawnEggItem.java.patch index d8234d335..113a0ab0c 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/SpawnEggItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/SpawnEggItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/SpawnEggItem.java b/net/minecraft/world/item/SpawnEggItem.java +index ea79f2d579763ed8a5116c40e1d3f70fce5f043f..646fb8131e33a1368ef1b2a6ae72d89b6fdba937 100644 --- a/net/minecraft/world/item/SpawnEggItem.java +++ b/net/minecraft/world/item/SpawnEggItem.java -@@ -69,6 +_,23 @@ +@@ -69,6 +69,23 @@ public class SpawnEggItem extends Item { return InteractionResult.FAIL; } else { if (level.paperConfig().entities.spawning.disableMobSpawnerSpawnEggTransformation) return InteractionResult.FAIL; // Paper - Allow disabling mob spawner spawn egg transformation diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ThrowablePotionItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/ThrowablePotionItem.java.patch similarity index 71% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/ThrowablePotionItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/ThrowablePotionItem.java.patch index 5cf5ead6e..856ec0897 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/ThrowablePotionItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/ThrowablePotionItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/ThrowablePotionItem.java b/net/minecraft/world/item/ThrowablePotionItem.java +index 92a2a9c84d8f0a44dffee22834f5ae6c6b4fec43..e2cdb3d43eca6e0e52fb00fbf3801f4b0983c19b 100644 --- a/net/minecraft/world/item/ThrowablePotionItem.java +++ b/net/minecraft/world/item/ThrowablePotionItem.java -@@ -24,7 +_,7 @@ +@@ -24,7 +24,7 @@ public abstract class ThrowablePotionItem extends PotionItem implements Projecti ItemStack itemInHand = player.getItemInHand(hand); if (level instanceof ServerLevel serverLevel) { // Paper start - PlayerLaunchProjectileEvent diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/TridentItem.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/TridentItem.java.patch similarity index 75% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/TridentItem.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/TridentItem.java.patch index 16aa72e60..f885c7d3f 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/TridentItem.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/TridentItem.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/TridentItem.java b/net/minecraft/world/item/TridentItem.java +index 2c38f40e87e711942c41c0740fbb2b4080ab9bcf..44b616ad2740d6ba9c8b2579ecd14edde64fffbb 100644 --- a/net/minecraft/world/item/TridentItem.java +++ b/net/minecraft/world/item/TridentItem.java -@@ -83,7 +_,7 @@ +@@ -83,7 +83,7 @@ public class TridentItem extends Item implements ProjectileItem { if (tridentSpinAttackStrength == 0.0F) { ItemStack itemStack = stack.copyWithCount(1); // Paper Projectile.Delayed tridentDelayed = Projectile.spawnProjectileFromRotationDelayed( // Paper - PlayerLaunchProjectileEvent( @@ -9,7 +17,7 @@ ); // Paper start - PlayerLaunchProjectileEvent com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) player.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(stack), (org.bukkit.entity.Projectile) tridentDelayed.projectile().getBukkitEntity()); -@@ -93,6 +_,7 @@ +@@ -93,6 +93,7 @@ public class TridentItem extends Item implements ProjectileItem { return false; } ThrownTrident thrownTrident = tridentDelayed.projectile(); // Paper - PlayerLaunchProjectileEvent diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java.patch similarity index 62% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java.patch index 65243f097..f4c8be854 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java b/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java +index 41e1e076a4567d3d3202cf8e426a1ebb391d85e8..2d710dd3f20cbea06c16f14a558b575b369c6ca2 100644 --- a/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java +++ b/net/minecraft/world/item/consume_effects/ClearAllStatusEffectsConsumeEffect.java -@@ -20,6 +_,12 @@ +@@ -20,6 +20,12 @@ public record ClearAllStatusEffectsConsumeEffect() implements ConsumeEffect { @Override // CraftBukkit start public boolean apply(Level level, ItemStack stack, LivingEntity entity, org.bukkit.event.entity.EntityPotionEffectEvent.Cause cause) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/crafting/Ingredient.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/crafting/Ingredient.java.patch similarity index 60% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/crafting/Ingredient.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/crafting/Ingredient.java.patch index fcee0a726..5130916b1 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/crafting/Ingredient.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/crafting/Ingredient.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/crafting/Ingredient.java b/net/minecraft/world/item/crafting/Ingredient.java +index 879c8fe1f20decc793cfa39e686b61d521bd76ba..9c383a1028988cdd3de8b29ba72a4d7bd2a37c7e 100644 --- a/net/minecraft/world/item/crafting/Ingredient.java +++ b/net/minecraft/world/item/crafting/Ingredient.java -@@ -36,6 +_,7 @@ +@@ -36,6 +36,7 @@ public final class Ingredient implements StackedContents.IngredientInfo itemStacks; // Paper - Improve exact choice recipe ingredients @@ -8,7 +16,7 @@ public boolean isExact() { return this.itemStacks != null; -@@ -88,6 +_,11 @@ +@@ -88,6 +89,11 @@ public final class Ingredient implements StackedContents.IngredientInfo +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/net/minecraft/world/item/enchantment/EnchantmentHelper.java +index 699cd012894cf9c09751c118d26994360f07193b..6adb770c867af41aabf7e3810ec147ac1e14d771 100644 --- a/net/minecraft/world/item/enchantment/EnchantmentHelper.java +++ b/net/minecraft/world/item/enchantment/EnchantmentHelper.java -@@ -606,4 +_,58 @@ +@@ -606,4 +606,58 @@ public class EnchantmentHelper { interface EnchantmentVisitor { void accept(Holder enchantment, int level); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/enchantment/ItemEnchantments.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/enchantment/ItemEnchantments.java.patch similarity index 78% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/enchantment/ItemEnchantments.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/enchantment/ItemEnchantments.java.patch index 9671562b1..6b73cf8aa 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/enchantment/ItemEnchantments.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/enchantment/ItemEnchantments.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/enchantment/ItemEnchantments.java b/net/minecraft/world/item/enchantment/ItemEnchantments.java +index 6040b73a5351c3eb166250566b5c2385cee39ee0..29619b87fe19c66934fe5aaee8a9641960091bf5 100644 --- a/net/minecraft/world/item/enchantment/ItemEnchantments.java +++ b/net/minecraft/world/item/enchantment/ItemEnchantments.java -@@ -32,7 +_,7 @@ +@@ -32,7 +32,7 @@ public class ItemEnchantments implements TooltipProvider { private static final java.util.Comparator> ENCHANTMENT_ORDER = java.util.Comparator.comparing(Holder::getRegisteredName); public static final ItemEnchantments EMPTY = new ItemEnchantments(new it.unimi.dsi.fastutil.objects.Object2IntAVLTreeMap<>(ENCHANTMENT_ORDER)); // Paper end - sort enchantments @@ -9,7 +17,7 @@ public static final Codec CODEC = Codec.unboundedMap(Enchantment.CODEC, LEVEL_CODEC) .xmap( map -> new net.minecraft.world.item.enchantment.ItemEnchantments(net.minecraft.Util.make(new it.unimi.dsi.fastutil.objects.Object2IntAVLTreeMap<>(ENCHANTMENT_ORDER), m -> m.putAll(map))), // Paper - sort enchantments -@@ -50,7 +_,7 @@ +@@ -50,7 +50,7 @@ public class ItemEnchantments implements TooltipProvider { for (Entry> entry : enchantments.object2IntEntrySet()) { int intValue = entry.getIntValue(); @@ -18,7 +26,7 @@ throw new IllegalArgumentException("Enchantment " + entry.getKey() + " has invalid level " + intValue); } } -@@ -133,13 +_,13 @@ +@@ -133,13 +133,13 @@ public class ItemEnchantments implements TooltipProvider { if (level <= 0) { this.enchantments.removeInt(enchantment); } else { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/trading/MerchantOffer.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/trading/MerchantOffer.java.patch similarity index 66% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/item/trading/MerchantOffer.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/trading/MerchantOffer.java.patch index d173c48d1..4ac473b3e 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/trading/MerchantOffer.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/item/trading/MerchantOffer.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/item/trading/MerchantOffer.java b/net/minecraft/world/item/trading/MerchantOffer.java +index 6afeb92c2e00ca5b945b7c7de9257bd741d53c3d..3e2a1b3f1098bf4f45fed76b6ca4f9a3d5add6ee 100644 --- a/net/minecraft/world/item/trading/MerchantOffer.java +++ b/net/minecraft/world/item/trading/MerchantOffer.java -@@ -143,8 +_,13 @@ +@@ -143,8 +143,13 @@ public class MerchantOffer { } public void updateDemand() { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/BaseSpawner.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/BaseSpawner.java.patch similarity index 53% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/BaseSpawner.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/BaseSpawner.java.patch index 472caee0b..24a15417f 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/BaseSpawner.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/BaseSpawner.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/BaseSpawner.java b/net/minecraft/world/level/BaseSpawner.java +index 8a46a80f93ae817c72dfcb8f1c1ed29c1ae95f7b..77b0a2705460b71f6ec293d3af009a1eddc63857 100644 --- a/net/minecraft/world/level/BaseSpawner.java +++ b/net/minecraft/world/level/BaseSpawner.java -@@ -62,6 +_,7 @@ +@@ -62,6 +62,7 @@ public abstract class BaseSpawner { } public boolean isNearPlayer(Level level, BlockPos pos) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/EntityGetter.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/EntityGetter.java.patch similarity index 58% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/EntityGetter.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/EntityGetter.java.patch index 73e6f74b1..cf9393378 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/EntityGetter.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/EntityGetter.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/EntityGetter.java b/net/minecraft/world/level/EntityGetter.java +index 9175a7e4e6076626cb46144c5858c2f2474f1858..452b6df03152dbd2311774bf4872983d3df92665 100644 --- a/net/minecraft/world/level/EntityGetter.java +++ b/net/minecraft/world/level/EntityGetter.java -@@ -185,7 +_,7 @@ +@@ -185,7 +185,7 @@ public interface EntityGetter extends ca.spottedleaf.moonrise.patches.chunk_syst default boolean hasNearbyAlivePlayer(double x, double y, double z, double distance) { for (Player player : this.players()) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/Level.java.patch similarity index 85% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/Level.java.patch index 6ef376885..94227cbea 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/Level.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java +index d225267b1b07854b76c88ce461d7817a86d023a0..1eac6ee2d3bb584a94a999f4f88c46b4d4a19977 100644 --- a/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java -@@ -166,11 +_,55 @@ +@@ -166,11 +166,55 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl } // Paper end - add paper world config @@ -56,7 +64,7 @@ public CraftWorld getWorld() { return this.world; } -@@ -846,6 +_,8 @@ +@@ -846,6 +890,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl // Paper end - getblock optimisations - cache world height/sections this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) levelData).getLevelName()); // Spigot this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config @@ -65,7 +73,7 @@ this.generator = generator; this.world = new CraftWorld((ServerLevel) this, generator, biomeProvider, environment); -@@ -2113,4 +_,14 @@ +@@ -2113,4 +2159,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl return this.id; } } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/NaturalSpawner.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/NaturalSpawner.java.patch similarity index 65% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/NaturalSpawner.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/NaturalSpawner.java.patch index ccb729f99..dd29bee93 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/NaturalSpawner.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/NaturalSpawner.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/NaturalSpawner.java b/net/minecraft/world/level/NaturalSpawner.java +index 911c5099a2bbb3e955c9314219114873642c7355..4c3fa61566ecabf8eccea32f10aabfa7c961e4c5 100644 --- a/net/minecraft/world/level/NaturalSpawner.java +++ b/net/minecraft/world/level/NaturalSpawner.java -@@ -263,7 +_,7 @@ +@@ -263,7 +263,7 @@ public final class NaturalSpawner { mutableBlockPos.set(x, y, z); double d = x + 0.5; double d1 = z + 0.5; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/ServerExplosion.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/ServerExplosion.java.patch similarity index 80% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/ServerExplosion.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/ServerExplosion.java.patch index 1b84cbc4e..607c1a7db 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/ServerExplosion.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/ServerExplosion.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java +index 1c521f9f32340cf75310686c90777e521ac3ae5c..c0c87b7c8e0b6b941fe8a63dc361504e94459d86 100644 --- a/net/minecraft/world/level/ServerExplosion.java +++ b/net/minecraft/world/level/ServerExplosion.java -@@ -636,6 +_,23 @@ +@@ -636,6 +636,23 @@ public class ServerExplosion implements Explosion { this.directMappedBlockCache = new ca.spottedleaf.moonrise.patches.collisions.ExplosionBlockCache[BLOCK_EXPLOSION_CACHE_WIDTH * BLOCK_EXPLOSION_CACHE_WIDTH * BLOCK_EXPLOSION_CACHE_WIDTH]; this.mutablePos = new BlockPos.MutableBlockPos(); // Paper end - collision optimisations diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/AnvilBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/AnvilBlock.java.patch similarity index 89% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/AnvilBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/AnvilBlock.java.patch index e604b9e74..866c868f3 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/AnvilBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/AnvilBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/AnvilBlock.java b/net/minecraft/world/level/block/AnvilBlock.java +index f92c3b35e51c154625fb6c84b8f4980fffb56b19..d2af657b731962a602d22297da549fbf0aa55e8a 100644 --- a/net/minecraft/world/level/block/AnvilBlock.java +++ b/net/minecraft/world/level/block/AnvilBlock.java -@@ -54,6 +_,53 @@ +@@ -54,6 +54,53 @@ public class AnvilBlock extends FallingBlock { return this.defaultBlockState().setValue(FACING, context.getHorizontalDirection().getClockWise()); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/AzaleaBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/AzaleaBlock.java.patch similarity index 70% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/AzaleaBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/AzaleaBlock.java.patch index 066e2cfd6..45c279c8a 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/AzaleaBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/AzaleaBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/AzaleaBlock.java b/net/minecraft/world/level/block/AzaleaBlock.java +index 435a455ad2ec3dfb142d570a51a720bc6c49dac3..32a1dc20202bad7a15794e98cdc1bf2fb2ad5308 100644 --- a/net/minecraft/world/level/block/AzaleaBlock.java +++ b/net/minecraft/world/level/block/AzaleaBlock.java -@@ -50,6 +_,20 @@ +@@ -50,6 +50,20 @@ public class AzaleaBlock extends VegetationBlock implements BonemealableBlock { @Override public void performBonemeal(ServerLevel level, RandomSource random, BlockPos pos, BlockState state) { diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java.patch new file mode 100644 index 000000000..8025d0b71 --- /dev/null +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java.patch @@ -0,0 +1,18 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java b/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java +index fb6e9194440b85487660f91aea7e34fdf086187b..2653ae5bf66f2b117f86e4df04d9cc307ba09011 100644 +--- a/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java ++++ b/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java +@@ -39,6 +39,7 @@ public abstract class BaseCoralPlantTypeBlock extends Block implements SimpleWat + } + + protected static boolean scanForWater(BlockState state, BlockGetter level, BlockPos pos) { ++ if (!((net.minecraft.world.level.LevelAccessor) level).getMinecraftWorld().purpurConfig.coralDieOutsideWater) return true; // Purpur - Config to not let coral die + if (state.getValue(WATERLOGGED)) { + return true; + } else { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BedBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/BedBlock.java.patch similarity index 73% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BedBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/BedBlock.java.patch index e0980cdaf..c30fbd0cd 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BedBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/BedBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/BedBlock.java b/net/minecraft/world/level/block/BedBlock.java +index 63768a73c04060fbc4aceb734ba32bc203514017..7111d6f2693efc1628d4c09e9717604a84ae0e52 100644 --- a/net/minecraft/world/level/block/BedBlock.java +++ b/net/minecraft/world/level/block/BedBlock.java -@@ -98,7 +_,7 @@ +@@ -98,7 +98,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock } Vec3 center = pos.getCenter(); @@ -9,7 +17,7 @@ return InteractionResult.SUCCESS_SERVER; } else if (state.getValue(OCCUPIED)) { if (!BedBlock.canSetSpawn(level)) return this.explodeBed(state, level, pos); // Paper - check explode first -@@ -146,7 +_,7 @@ +@@ -146,7 +146,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock } Vec3 center = pos.getCenter(); @@ -18,7 +26,7 @@ return InteractionResult.SUCCESS_SERVER; } // CraftBukkit end -@@ -167,7 +_,7 @@ +@@ -167,7 +167,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock @Override public void fallOn(Level level, BlockState state, BlockPos pos, Entity entity, double fallDistance) { diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/BigDripleafBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/BigDripleafBlock.java.patch new file mode 100644 index 000000000..ee493d9b8 --- /dev/null +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/BigDripleafBlock.java.patch @@ -0,0 +1,19 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/BigDripleafBlock.java b/net/minecraft/world/level/block/BigDripleafBlock.java +index b0b18ec7038509cca2d4647cf277ea544eb45f35..24599a3ef75fda6feb94de8e895920f1eab1d08e 100644 +--- a/net/minecraft/world/level/block/BigDripleafBlock.java ++++ b/net/minecraft/world/level/block/BigDripleafBlock.java +@@ -254,7 +254,7 @@ public class BigDripleafBlock extends HorizontalDirectionalBlock implements Bone + playTiltSound(level, pos, sound); + } + +- int _int = DELAY_UNTIL_NEXT_TILT_STATE.getInt(tilt); ++ int _int = level.purpurConfig.bigDripleafTiltDelay.getOrDefault(tilt, -1); // Purpur - Big dripleaf tilt delay + if (_int != -1) { + level.scheduleTick(pos, this, _int); + } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Block.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/Block.java.patch similarity index 85% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Block.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/Block.java.patch index 85f668c68..1b5236e87 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Block.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/Block.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/Block.java b/net/minecraft/world/level/block/Block.java +index 572fcb33b14d16334e2ab92ddf8699f1ba975aff..9d913ac1dcd6eb48b1f1bff6a88ac2bd5e75376b 100644 --- a/net/minecraft/world/level/block/Block.java +++ b/net/minecraft/world/level/block/Block.java -@@ -103,6 +_,10 @@ +@@ -103,6 +103,10 @@ public class Block extends BlockBehaviour implements ItemLike { public static final int UPDATE_LIMIT = 512; protected final StateDefinition stateDefinition; private BlockState defaultBlockState; @@ -11,7 +19,7 @@ // Paper start - Protect Bedrock and End Portal/Frames from being destroyed public final boolean isDestroyable() { return io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowPermanentBlockBreakExploits || -@@ -384,7 +_,7 @@ +@@ -384,7 +388,7 @@ public class Block extends BlockBehaviour implements ItemLike { event.setExpToDrop(block.getExpDrop(state, serverLevel, pos, net.minecraft.world.item.ItemStack.EMPTY, true)); // Paper - Properly handle xp dropping event.callEvent(); for (org.bukkit.inventory.ItemStack drop : event.getDrops()) { @@ -20,7 +28,7 @@ } state.spawnAfterBreak(serverLevel, pos, ItemStack.EMPTY, false); // Paper - Properly handle xp dropping block.popExperience(serverLevel, pos, event.getExpToDrop()); // Paper - Properly handle xp dropping -@@ -402,7 +_,7 @@ +@@ -402,7 +406,7 @@ public class Block extends BlockBehaviour implements ItemLike { public static void dropResources(BlockState state, LevelAccessor level, BlockPos pos, @Nullable BlockEntity blockEntity) { if (level instanceof ServerLevel) { @@ -29,7 +37,7 @@ state.spawnAfterBreak((ServerLevel)level, pos, ItemStack.EMPTY, true); } } -@@ -414,11 +_,30 @@ +@@ -414,11 +418,30 @@ public class Block extends BlockBehaviour implements ItemLike { public static void dropResources(BlockState state, Level level, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool, boolean dropExperience) { // Paper end - Properly handle xp dropping if (level instanceof ServerLevel) { @@ -61,11 +69,10 @@ public static void popResource(Level level, BlockPos pos, ItemStack stack) { double d = EntityType.ITEM.getHeight() / 2.0; double d1 = pos.getX() + 0.5 + Mth.nextDouble(level.random, -0.25, 0.25); -@@ -499,7 +_,15 @@ +@@ -499,7 +522,15 @@ public class Block extends BlockBehaviour implements ItemLike { } public void setPlacedBy(Level level, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) { -- } + this.placer = placer; // Purpur - Store placer on Block when placed + } + @@ -73,12 +80,12 @@ + @Nullable protected LivingEntity placer = null; + public void forgetPlacer() { + this.placer = null; -+ } + } + // Purpur end - Store placer on Block when placed public boolean isPossibleToRespawnInThis(BlockState state) { return !state.isSolid() && !state.liquid(); -@@ -510,7 +_,7 @@ +@@ -510,7 +541,7 @@ public class Block extends BlockBehaviour implements ItemLike { } public void fallOn(Level level, BlockState state, BlockPos pos, Entity entity, double fallDistance) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Blocks.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/Blocks.java.patch similarity index 59% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Blocks.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/Blocks.java.patch index d8d44c294..e2cecd32c 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Blocks.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/Blocks.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/Blocks.java b/net/minecraft/world/level/block/Blocks.java +index e5129823a05843c86d4ef282244502fd515915c0..6df3cd84281ee7948457d170e69bdddbf1219c3c 100644 --- a/net/minecraft/world/level/block/Blocks.java +++ b/net/minecraft/world/level/block/Blocks.java -@@ -6744,6 +_,7 @@ +@@ -6744,6 +6744,7 @@ public class Blocks { BlockBehaviour.Properties.of() .mapColor(MapColor.PLANT) .forceSolidOff() @@ -8,7 +16,7 @@ .instabreak() .sound(SoundType.AZALEA) .noOcclusion() -@@ -6755,6 +_,7 @@ +@@ -6755,6 +6756,7 @@ public class Blocks { BlockBehaviour.Properties.of() .mapColor(MapColor.PLANT) .forceSolidOff() diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BubbleColumnBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/BubbleColumnBlock.java.patch similarity index 66% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BubbleColumnBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/BubbleColumnBlock.java.patch index 6d57a3ee0..882584068 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/BubbleColumnBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/BubbleColumnBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/BubbleColumnBlock.java b/net/minecraft/world/level/block/BubbleColumnBlock.java +index 3d39e5c1bf1bd7c0ae738721d1168cf21b48b877..4673f654871eb9a5998a81cfeebe71b75c9f191f 100644 --- a/net/minecraft/world/level/block/BubbleColumnBlock.java +++ b/net/minecraft/world/level/block/BubbleColumnBlock.java -@@ -99,9 +_,9 @@ +@@ -99,9 +99,9 @@ public class BubbleColumnBlock extends Block implements BucketPickup { if (state.is(Blocks.BUBBLE_COLUMN)) { return state; } else if (state.is(Blocks.SOUL_SAND)) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CactusBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CactusBlock.java.patch similarity index 80% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CactusBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CactusBlock.java.patch index 4fec7e3b9..3074c56df 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CactusBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CactusBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/CactusBlock.java b/net/minecraft/world/level/block/CactusBlock.java +index 5ed89812cbc94a3df20d0e74b4569152164c9c2a..7b43592090c2bf2cc78e3c5205237c01079bf0b9 100644 --- a/net/minecraft/world/level/block/CactusBlock.java +++ b/net/minecraft/world/level/block/CactusBlock.java -@@ -22,7 +_,7 @@ +@@ -22,7 +22,7 @@ import net.minecraft.world.level.pathfinder.PathComputationType; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -9,7 +17,7 @@ public static final MapCodec CODEC = simpleCodec(CactusBlock::new); public static final IntegerProperty AGE = BlockStateProperties.AGE_15; public static final int MAX_AGE = 15; -@@ -117,7 +_,7 @@ +@@ -117,7 +117,7 @@ public class CactusBlock extends Block { protected boolean canSurvive(BlockState state, LevelReader level, BlockPos pos) { for (Direction direction : Direction.Plane.HORIZONTAL) { BlockState blockState = level.getBlockState(pos.relative(direction)); @@ -18,7 +26,7 @@ return false; } } -@@ -141,4 +_,34 @@ +@@ -141,4 +141,34 @@ public class CactusBlock extends Block { protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) { return false; } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CakeBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CakeBlock.java.patch similarity index 59% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CakeBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CakeBlock.java.patch index c78b443f8..5d424ebd1 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CakeBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CakeBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/CakeBlock.java b/net/minecraft/world/level/block/CakeBlock.java +index cca7bde128f88df4327e6b011c301f60d909bb4d..576e00d1e9eb2a692b1ee0f1086ee0db230d4e7e 100644 --- a/net/minecraft/world/level/block/CakeBlock.java +++ b/net/minecraft/world/level/block/CakeBlock.java -@@ -109,6 +_,7 @@ +@@ -109,6 +109,7 @@ public class CakeBlock extends Block { org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, 2 + oldFoodLevel); if (!event.isCancelled()) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CampfireBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CampfireBlock.java.patch similarity index 52% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CampfireBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CampfireBlock.java.patch index 6557f2a69..afcfa75b5 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CampfireBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CampfireBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/CampfireBlock.java b/net/minecraft/world/level/block/CampfireBlock.java +index d6aaebacfb9b713dafb718d1e7ade8da8111ebb5..6129f48418532c5b4b4d5515bc75cffb85073984 100644 --- a/net/minecraft/world/level/block/CampfireBlock.java +++ b/net/minecraft/world/level/block/CampfireBlock.java -@@ -124,7 +_,7 @@ +@@ -124,7 +124,7 @@ public class CampfireBlock extends BaseEntityBlock implements SimpleWaterloggedB return this.defaultBlockState() .setValue(WATERLOGGED, flag) .setValue(SIGNAL_FIRE, this.isSmokeSource(level.getBlockState(clickedPos.below()))) diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch similarity index 80% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch index 2333b9e08..e259c7b39 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CarvedPumpkinBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/CarvedPumpkinBlock.java b/net/minecraft/world/level/block/CarvedPumpkinBlock.java +index ccb8cf919ce5233eb1de87c35a48c50bef2b1754..dd260cd9134f503856991f723a05c6e8e3bab0a9 100644 --- a/net/minecraft/world/level/block/CarvedPumpkinBlock.java +++ b/net/minecraft/world/level/block/CarvedPumpkinBlock.java -@@ -74,7 +_,7 @@ +@@ -74,7 +74,7 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock { if (blockPatternMatch != null) { SnowGolem snowGolem = EntityType.SNOW_GOLEM.create(level, EntitySpawnReason.TRIGGERED); if (snowGolem != null) { @@ -9,7 +17,7 @@ return; } } -@@ -84,7 +_,7 @@ +@@ -84,7 +84,7 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock { IronGolem ironGolem = EntityType.IRON_GOLEM.create(level, EntitySpawnReason.TRIGGERED); if (ironGolem != null) { ironGolem.setPlayerCreated(true); @@ -18,7 +26,7 @@ return; } } -@@ -93,7 +_,7 @@ +@@ -93,7 +93,7 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock { if (blockPatternMatch2 != null) { CopperGolem copperGolem = EntityType.COPPER_GOLEM.create(level, EntitySpawnReason.TRIGGERED); if (copperGolem != null) { @@ -27,7 +35,7 @@ if (!copperGolem.valid) return; // Paper - entityspawnevent - entity was not added to the world so prevent world mutation this.replaceCopperBlockWithChest(level, blockPatternMatch2); copperGolem.spawn(this.getWeatherStateFromPattern(blockPatternMatch2)); -@@ -112,7 +_,20 @@ +@@ -112,7 +112,20 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock { .getAge(); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CauldronBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CauldronBlock.java.patch similarity index 60% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CauldronBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CauldronBlock.java.patch index 6ead2196b..5e13f415d 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CauldronBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CauldronBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/CauldronBlock.java b/net/minecraft/world/level/block/CauldronBlock.java +index 523a769ce8f73b2f216d0768ab8f2f9f1bfa949d..703c15dfc3dd0b209502c0a0b75d714318e608a8 100644 --- a/net/minecraft/world/level/block/CauldronBlock.java +++ b/net/minecraft/world/level/block/CauldronBlock.java -@@ -32,8 +_,8 @@ +@@ -32,8 +32,8 @@ public class CauldronBlock extends AbstractCauldronBlock { protected static boolean shouldHandlePrecipitation(Level level, Biome.Precipitation precipitation) { return precipitation == Biome.Precipitation.RAIN diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CaveVinesBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CaveVinesBlock.java.patch similarity index 53% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CaveVinesBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CaveVinesBlock.java.patch index a024a56e2..2d7db8091 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CaveVinesBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CaveVinesBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/CaveVinesBlock.java b/net/minecraft/world/level/block/CaveVinesBlock.java +index f4a4dc14012c110e58b1c9272d80d4b89394d090..da85ec2b88b200fd28d89d9ae35c7319d4b028b7 100644 --- a/net/minecraft/world/level/block/CaveVinesBlock.java +++ b/net/minecraft/world/level/block/CaveVinesBlock.java -@@ -92,4 +_,11 @@ +@@ -92,4 +92,11 @@ public class CaveVinesBlock extends GrowingPlantHeadBlock implements CaveVines { public void performBonemeal(ServerLevel level, RandomSource random, BlockPos pos, BlockState state) { level.setBlock(pos, state.setValue(BERRIES, true), Block.UPDATE_CLIENTS); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChangeOverTimeBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ChangeOverTimeBlock.java.patch similarity index 52% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChangeOverTimeBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ChangeOverTimeBlock.java.patch index 54d2fa463..20b348157 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChangeOverTimeBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ChangeOverTimeBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/ChangeOverTimeBlock.java b/net/minecraft/world/level/block/ChangeOverTimeBlock.java +index ba7dbfa3f95bf93f3e50b17aa48b772a3047b74d..d42062a86c1278b71bc085cc3fb29a69039873de 100644 --- a/net/minecraft/world/level/block/ChangeOverTimeBlock.java +++ b/net/minecraft/world/level/block/ChangeOverTimeBlock.java -@@ -51,7 +_,7 @@ +@@ -51,7 +51,7 @@ public interface ChangeOverTimeBlock> { } float f = (float)(i1 + 1) / (i1 + i + 1); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChestBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ChestBlock.java.patch similarity index 50% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChestBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ChestBlock.java.patch index 5f1bdc23f..941c585d1 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChestBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ChestBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/ChestBlock.java b/net/minecraft/world/level/block/ChestBlock.java +index 3cce87fd6e1d9d65d6b28bf44dd218541e815788..bf75ac5cd4074a13581baaa87e93463c83cca2e6 100644 --- a/net/minecraft/world/level/block/ChestBlock.java +++ b/net/minecraft/world/level/block/ChestBlock.java -@@ -369,6 +_,7 @@ +@@ -369,6 +369,7 @@ public class ChestBlock extends AbstractChestBlock implements } public static boolean isBlockedChestByBlock(BlockGetter level, BlockPos pos) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ComposterBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ComposterBlock.java.patch similarity index 82% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ComposterBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ComposterBlock.java.patch index f2b522991..e364b3e7a 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ComposterBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ComposterBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/ComposterBlock.java b/net/minecraft/world/level/block/ComposterBlock.java +index 0707e08970a325f6a21f3fc2f48c0b7bfbcbcd45..90ef0ea828303ccfa568c6acb3975c48f628261a 100644 --- a/net/minecraft/world/level/block/ComposterBlock.java +++ b/net/minecraft/world/level/block/ComposterBlock.java -@@ -250,23 +_,52 @@ +@@ -250,17 +250,27 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder { ) { int levelValue = state.getValue(LEVEL); if (levelValue < 8 && COMPOSTABLES.containsKey(stack.getItem())) { @@ -14,12 +22,11 @@ - level.levelEvent(LevelEvent.COMPOSTER_FILL, pos, state != blockState ? 1 : 0); - player.awardStat(Stats.ITEM_USED.get(stack.getItem())); - stack.consume(1, player); -- } + // Purpur start - sneak to bulk process composter + BlockState newState = process(levelValue, player, state, level, pos, stack); + if (newState == null) { + return InteractionResult.PASS; -+ } + } + if (level.purpurConfig.composterBulkProcess && player.isShiftKeyDown() && newState != state) { + BlockState oldState; + int oldCount, newCount, oldLevel, newLevel; @@ -39,10 +46,10 @@ return InteractionResult.SUCCESS; } else { - return super.useItemOn(stack, state, level, pos, player, hand, hitResult); +@@ -268,6 +278,25 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder { } } -+ + + // Purpur start - sneak to bulk process composter + private static @Nullable BlockState process(int levelValue, Player player, BlockState state, Level level, BlockPos pos, ItemStack stack) { + if (levelValue < 7 && !level.isClientSide()) { @@ -61,6 +68,7 @@ + return state; + } + // Purpur end - Sneak to bulk process composter - ++ @Override protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) { + int levelValue = state.getValue(LEVEL); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CoralBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CoralBlock.java.patch similarity index 54% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CoralBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CoralBlock.java.patch index 690cfe031..1e7290b52 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CoralBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CoralBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/CoralBlock.java b/net/minecraft/world/level/block/CoralBlock.java +index a43ab4e437ea53be5542d9824235ae3743da5402..d3867b86bf21107c51de76b170cdab35ed2b0ecf 100644 --- a/net/minecraft/world/level/block/CoralBlock.java +++ b/net/minecraft/world/level/block/CoralBlock.java -@@ -65,6 +_,7 @@ +@@ -65,6 +65,7 @@ public class CoralBlock extends Block { } protected boolean scanForWater(BlockGetter level, BlockPos pos) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CropBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CropBlock.java.patch similarity index 78% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CropBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CropBlock.java.patch index cd0927a8e..43ebf1d41 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/CropBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/CropBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/CropBlock.java b/net/minecraft/world/level/block/CropBlock.java +index fe573b6fe5c231ed78c063954e35de65edad7342..4d7e01fea4bac6cf71cbca3deae632df0f738497 100644 --- a/net/minecraft/world/level/block/CropBlock.java +++ b/net/minecraft/world/level/block/CropBlock.java -@@ -169,7 +_,7 @@ +@@ -169,7 +169,7 @@ public class CropBlock extends VegetationBlock implements BonemealableBlock { @Override protected void entityInside(BlockState state, Level level, BlockPos pos, Entity entity, InsideBlockEffectApplier effectApplier, boolean pastEdges) { if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(level, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent @@ -9,7 +17,7 @@ serverLevel.destroyBlock(pos, true, entity); } -@@ -204,4 +_,15 @@ +@@ -204,4 +204,15 @@ public class CropBlock extends VegetationBlock implements BonemealableBlock { protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(AGE); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DoorBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/DoorBlock.java.patch similarity index 75% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DoorBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/DoorBlock.java.patch index fab0aced9..e10d7fb66 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DoorBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/DoorBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/DoorBlock.java b/net/minecraft/world/level/block/DoorBlock.java +index 23e892bb2453617c5fd54360a47bf5fd404609b9..1eba3feeed88281e0bba76b22e35057d80bb6599 100644 --- a/net/minecraft/world/level/block/DoorBlock.java +++ b/net/minecraft/world/level/block/DoorBlock.java -@@ -199,6 +_,7 @@ +@@ -199,6 +199,7 @@ public class DoorBlock extends Block { protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) { if (!this.type.canOpenByHand()) { return InteractionResult.PASS; @@ -8,7 +16,7 @@ } else { state = state.cycle(OPEN); level.setBlock(pos, state, Block.UPDATE_CLIENTS | Block.UPDATE_IMMEDIATE); -@@ -287,4 +_,18 @@ +@@ -287,4 +288,18 @@ public class DoorBlock extends Block { public static boolean isWoodenDoor(BlockState state) { return state.getBlock() instanceof DoorBlock doorBlock && doorBlock.type().canOpenByHand(); } diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/DragonEggBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/DragonEggBlock.java.patch new file mode 100644 index 000000000..a3be3a87e --- /dev/null +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/DragonEggBlock.java.patch @@ -0,0 +1,18 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/DragonEggBlock.java b/net/minecraft/world/level/block/DragonEggBlock.java +index 52160294e39e3f0f471087a1fcb6e46763862954..c38fbff78f1acef9328c91d7b88d5db1971c9474 100644 +--- a/net/minecraft/world/level/block/DragonEggBlock.java ++++ b/net/minecraft/world/level/block/DragonEggBlock.java +@@ -46,6 +46,7 @@ public class DragonEggBlock extends FallingBlock { + } + + private void teleport(BlockState state, Level level, BlockPos pos) { ++ if (!level.purpurConfig.dragonEggTeleport) return; // Purpur - Option to disable dragon egg teleporting + WorldBorder worldBorder = level.getWorldBorder(); + + for (int i = 0; i < 1000; i++) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/FarmBlock.java.patch similarity index 83% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/FarmBlock.java.patch index c04018815..d40b8a461 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/FarmBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/FarmBlock.java b/net/minecraft/world/level/block/FarmBlock.java +index a31ac95237515b874f59941ec24c74e2c357b3d8..9883e6d1a1b76155c8ba1817fda6615b4742e18e 100644 --- a/net/minecraft/world/level/block/FarmBlock.java +++ b/net/minecraft/world/level/block/FarmBlock.java -@@ -112,7 +_,7 @@ +@@ -112,7 +112,7 @@ public class FarmBlock extends Block { public void fallOn(Level level, BlockState state, BlockPos pos, Entity entity, double fallDistance) { super.fallOn(level, state, pos, entity, fallDistance); // CraftBukkit - moved here as game rules / events shouldn't affect fall damage. if (level instanceof ServerLevel serverLevel @@ -9,7 +17,7 @@ && entity instanceof LivingEntity && (entity instanceof Player || serverLevel.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) && entity.getBbWidth() * entity.getBbWidth() * entity.getBbHeight() > 0.512F) { -@@ -129,6 +_,28 @@ +@@ -129,6 +129,28 @@ public class FarmBlock extends Block { return; } @@ -38,7 +46,7 @@ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState())) { return; } -@@ -177,7 +_,7 @@ +@@ -177,7 +199,7 @@ public class FarmBlock extends Block { } } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/GrowingPlantHeadBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/GrowingPlantHeadBlock.java.patch similarity index 77% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/GrowingPlantHeadBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/GrowingPlantHeadBlock.java.patch index 7dd50302a..bdfe85808 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/GrowingPlantHeadBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/GrowingPlantHeadBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/GrowingPlantHeadBlock.java b/net/minecraft/world/level/block/GrowingPlantHeadBlock.java +index fe11f3ec82ebdbdf3d024d7273fb16b6823b1ece..daaf0ddee9192fa24a70954ce52b381560fcbc1f 100644 --- a/net/minecraft/world/level/block/GrowingPlantHeadBlock.java +++ b/net/minecraft/world/level/block/GrowingPlantHeadBlock.java -@@ -34,12 +_,12 @@ +@@ -34,12 +34,12 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements @Override public BlockState getStateForPlacement(RandomSource random) { @@ -15,7 +23,7 @@ } @Override -@@ -55,7 +_,7 @@ +@@ -55,7 +55,7 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements } else if (this == Blocks.CAVE_VINES) { modifier = level.spigotConfig.caveVinesModifier; } @@ -24,7 +32,7 @@ // Spigot end BlockPos blockPos = pos.relative(this.growthDirection); if (this.canGrowInto(level.getBlockState(blockPos))) { -@@ -75,11 +_,11 @@ +@@ -75,11 +75,11 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements } public BlockState getMaxAgeState(BlockState state) { @@ -38,7 +46,7 @@ } protected BlockState updateBodyAfterConvertedFromHead(BlockState head, BlockState body) { -@@ -137,13 +_,13 @@ +@@ -137,13 +137,13 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements @Override public void performBonemeal(ServerLevel level, RandomSource random, BlockPos pos, BlockState state) { BlockPos blockPos = pos.relative(this.growthDirection); @@ -54,7 +62,7 @@ } } -@@ -155,4 +_,6 @@ +@@ -155,4 +155,6 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements protected GrowingPlantHeadBlock getHeadBlock() { return this; } diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/HayBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/HayBlock.java.patch new file mode 100644 index 000000000..20d28ac8b --- /dev/null +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/HayBlock.java.patch @@ -0,0 +1,18 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/HayBlock.java b/net/minecraft/world/level/block/HayBlock.java +index cdde0a25e0a499d7575c00796143a033feb1f22f..999ecf16180b0a862cf8527ce532acf725ba869a 100644 +--- a/net/minecraft/world/level/block/HayBlock.java ++++ b/net/minecraft/world/level/block/HayBlock.java +@@ -23,6 +23,6 @@ public class HayBlock extends RotatedPillarBlock { + + @Override + public void fallOn(Level level, BlockState state, BlockPos pos, Entity entity, double fallDistance) { +- entity.causeFallDamage(fallDistance, 0.2F, level.damageSources().fall()); ++ super.fallOn(level, state, pos, entity, fallDistance); // Purpur - Configurable block fall damage modifiers + } + } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/IceBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/IceBlock.java.patch similarity index 65% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/IceBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/IceBlock.java.patch index 0f5251d57..9e2746cd2 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/IceBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/IceBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/IceBlock.java b/net/minecraft/world/level/block/IceBlock.java +index f3b649b9c4d949910c38bc59a3d4316fb73a481b..080c1f7a3e54481cad4ff0bd71cae2cb54e5e260 100644 --- a/net/minecraft/world/level/block/IceBlock.java +++ b/net/minecraft/world/level/block/IceBlock.java -@@ -40,7 +_,7 @@ +@@ -40,7 +40,7 @@ public class IceBlock extends HalfTransparentBlock { public void afterDestroy(Level level, BlockPos pos, ItemStack stack) { // Paper end - Improve Block#breakNaturally API if (!EnchantmentHelper.hasTag(stack, EnchantmentTags.PREVENTS_ICE_MELTING)) { @@ -9,7 +17,7 @@ level.removeBlock(pos, false); return; } -@@ -65,7 +_,7 @@ +@@ -65,7 +65,7 @@ public class IceBlock extends HalfTransparentBlock { return; } // CraftBukkit end diff --git a/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/KelpBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/KelpBlock.java.patch new file mode 100644 index 000000000..dfb45d613 --- /dev/null +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/KelpBlock.java.patch @@ -0,0 +1,22 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/KelpBlock.java b/net/minecraft/world/level/block/KelpBlock.java +index 8e3f2518e705a4b8988a1c9da730f0c89f21bdce..6e6212fd891dcaea0d0a398a73416f31d2cb2406 100644 +--- a/net/minecraft/world/level/block/KelpBlock.java ++++ b/net/minecraft/world/level/block/KelpBlock.java +@@ -72,4 +72,11 @@ public class KelpBlock extends GrowingPlantHeadBlock implements LiquidBlockConta + protected FluidState getFluidState(BlockState state) { + return Fluids.WATER.getSource(false); + } ++ ++ // Purpur start - kelp vines configurable max growth age ++ @Override ++ public int getMaxGrowthAge() { ++ return org.purpurmc.purpur.PurpurConfig.kelpMaxGrowthAge; ++ } ++ // Purpur end - kelp vines configurable max growth age + } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/LiquidBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/LiquidBlock.java.patch similarity index 71% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/LiquidBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/LiquidBlock.java.patch index 449e5e6c6..9927c6ba0 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/LiquidBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/LiquidBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/LiquidBlock.java b/net/minecraft/world/level/block/LiquidBlock.java +index 70cb8b2cf79833d8b5f9cee6d9c5495e5b706078..8c00026651da489ab954710b59d5a03bf54ffd0d 100644 --- a/net/minecraft/world/level/block/LiquidBlock.java +++ b/net/minecraft/world/level/block/LiquidBlock.java -@@ -138,7 +_,7 @@ +@@ -138,7 +138,7 @@ public class LiquidBlock extends Block implements BucketPickup { @Override protected void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldState, boolean movedByPiston) { @@ -9,7 +17,7 @@ level.scheduleTick(pos, state.getFluidState().getType(), this.getFlowSpeed(level, pos)); // Paper - Configurable speed for water flowing over lava } } -@@ -175,7 +_,7 @@ +@@ -175,7 +175,7 @@ public class LiquidBlock extends Block implements BucketPickup { BlockState neighborState, RandomSource random ) { @@ -18,7 +26,7 @@ scheduledTickAccess.scheduleTick(pos, state.getFluidState().getType(), this.fluid.getTickDelay(level)); } -@@ -184,7 +_,7 @@ +@@ -184,7 +184,7 @@ public class LiquidBlock extends Block implements BucketPickup { @Override protected void neighborChanged(BlockState state, Level level, BlockPos pos, Block neighborBlock, @Nullable Orientation orientation, boolean movedByPiston) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/MagmaBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/MagmaBlock.java.patch similarity index 57% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/MagmaBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/MagmaBlock.java.patch index f9d8ca928..e73c01132 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/MagmaBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/MagmaBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/MagmaBlock.java b/net/minecraft/world/level/block/MagmaBlock.java +index 71344cb2580fb9a3cd523e25fb1a245711e275dd..bec06566342663479ee8342b7e5ceec61758c448 100644 --- a/net/minecraft/world/level/block/MagmaBlock.java +++ b/net/minecraft/world/level/block/MagmaBlock.java -@@ -28,7 +_,7 @@ +@@ -28,7 +28,7 @@ public class MagmaBlock extends Block { @Override public void stepOn(Level level, BlockPos pos, BlockState state, Entity entity) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NetherPortalBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/NetherPortalBlock.java.patch similarity index 65% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NetherPortalBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/NetherPortalBlock.java.patch index f6cfd250a..fe15047bd 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NetherPortalBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/NetherPortalBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/NetherPortalBlock.java b/net/minecraft/world/level/block/NetherPortalBlock.java +index d3f0a61c0c91d3a6a1dc4e59d57743ba89a9c19a..094d2031f9a184c06c7bdcc1d1d8a72ced462358 100644 --- a/net/minecraft/world/level/block/NetherPortalBlock.java +++ b/net/minecraft/world/level/block/NetherPortalBlock.java -@@ -67,7 +_,7 @@ +@@ -67,7 +67,7 @@ public class NetherPortalBlock extends Block implements Portal { protected void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) { if (level.spigotConfig.enableZombiePigmenPortalSpawns && level.dimensionType().natural() // Spigot && level.isSpawningMonsters() @@ -9,7 +17,7 @@ && level.anyPlayerCloseEnoughForSpawning(pos)) { while (level.getBlockState(pos).is(this)) { pos = pos.below(); -@@ -125,7 +_,7 @@ +@@ -125,7 +125,7 @@ public class NetherPortalBlock extends Block implements Portal { @Override public int getPortalTransitionTime(ServerLevel level, Entity entity) { return entity instanceof Player player diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NetherWartBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/NetherWartBlock.java.patch similarity index 81% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NetherWartBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/NetherWartBlock.java.patch index 362dae20a..60db1877f 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NetherWartBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/NetherWartBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/NetherWartBlock.java b/net/minecraft/world/level/block/NetherWartBlock.java +index a8cb58de6223006150bc49b95e5964b8fc42cecc..d25e2a37abb5e4c98116048fe2e96194149763ca 100644 --- a/net/minecraft/world/level/block/NetherWartBlock.java +++ b/net/minecraft/world/level/block/NetherWartBlock.java -@@ -16,7 +_,7 @@ +@@ -16,7 +16,7 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -9,7 +17,7 @@ public static final MapCodec CODEC = simpleCodec(NetherWartBlock::new); public static final int MAX_AGE = 3; public static final IntegerProperty AGE = BlockStateProperties.AGE_3; -@@ -65,4 +_,34 @@ +@@ -65,4 +65,34 @@ public class NetherWartBlock extends VegetationBlock { protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(AGE); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NoteBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/NoteBlock.java.patch similarity index 59% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NoteBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/NoteBlock.java.patch index 42c3d0b22..c0bb2d85d 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/NoteBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/NoteBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/NoteBlock.java b/net/minecraft/world/level/block/NoteBlock.java +index 99cee267b12497b76beb17cbf02f099dac18c0e9..b73340e78fc3a6bc9481ee5395e34b7c55b8f429 100644 --- a/net/minecraft/world/level/block/NoteBlock.java +++ b/net/minecraft/world/level/block/NoteBlock.java -@@ -101,7 +_,7 @@ +@@ -101,7 +101,7 @@ public class NoteBlock extends Block { } private void playNote(@Nullable Entity entity, BlockState state, Level level, BlockPos pos) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ObserverBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ObserverBlock.java.patch similarity index 54% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ObserverBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ObserverBlock.java.patch index 3202a8cee..2e522e670 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ObserverBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/ObserverBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/ObserverBlock.java b/net/minecraft/world/level/block/ObserverBlock.java +index 3c12d8e23f20b666b0005e597ba2e803c02d5d78..76ef1e378f7213fcb82f27598c443de3c6587d95 100644 --- a/net/minecraft/world/level/block/ObserverBlock.java +++ b/net/minecraft/world/level/block/ObserverBlock.java -@@ -81,6 +_,7 @@ +@@ -81,6 +81,7 @@ public class ObserverBlock extends DirectionalBlock { RandomSource random ) { if (state.getValue(FACING) == direction && !state.getValue(POWERED)) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch similarity index 73% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch index cad7d9a3c..227efb5fd 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/PointedDripstoneBlock.java b/net/minecraft/world/level/block/PointedDripstoneBlock.java +index a2b0498677e7fc070c006f62ba228a05ecdcf0c8..0331eb06f4b113479f4f1f8059cd511356d14048 100644 --- a/net/minecraft/world/level/block/PointedDripstoneBlock.java +++ b/net/minecraft/world/level/block/PointedDripstoneBlock.java -@@ -193,20 +_,20 @@ +@@ -193,20 +193,20 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate @VisibleForTesting public static void maybeTransferFluid(BlockState state, ServerLevel level, BlockPos pos, float randChance) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/PoweredRailBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/PoweredRailBlock.java.patch similarity index 51% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/PoweredRailBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/PoweredRailBlock.java.patch index f6c12cc4c..94dfb9178 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/PoweredRailBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/PoweredRailBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/PoweredRailBlock.java b/net/minecraft/world/level/block/PoweredRailBlock.java +index 1d1a2e183624ebae22b966ab59a174e941f139c0..e5b1b5ef643e5bfacd79120f97f15ad8beb8c7ee 100644 --- a/net/minecraft/world/level/block/PoweredRailBlock.java +++ b/net/minecraft/world/level/block/PoweredRailBlock.java -@@ -28,7 +_,7 @@ +@@ -28,7 +28,7 @@ public class PoweredRailBlock extends BaseRailBlock { } protected boolean findPoweredRailSignal(Level level, BlockPos pos, BlockState state, boolean searchForward, int recursionCount) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/RespawnAnchorBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/RespawnAnchorBlock.java.patch similarity index 62% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/RespawnAnchorBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/RespawnAnchorBlock.java.patch index 4b500909a..488e4e20d 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/RespawnAnchorBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/RespawnAnchorBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/RespawnAnchorBlock.java b/net/minecraft/world/level/block/RespawnAnchorBlock.java +index fad87904eed0d7816c41eb426b5942341d12ed50..f60e7193364433f7d5fadcac4c763a4cb797aabf 100644 --- a/net/minecraft/world/level/block/RespawnAnchorBlock.java +++ b/net/minecraft/world/level/block/RespawnAnchorBlock.java -@@ -161,7 +_,7 @@ +@@ -161,7 +161,7 @@ public class RespawnAnchorBlock extends Block { }; Vec3 center = pos2.getCenter(); level.explode( diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SculkShriekerBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SculkShriekerBlock.java.patch similarity index 57% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SculkShriekerBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SculkShriekerBlock.java.patch index aa23616be..d564bb931 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SculkShriekerBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SculkShriekerBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/SculkShriekerBlock.java b/net/minecraft/world/level/block/SculkShriekerBlock.java +index 465d13a748b5b6773bc0ee26ac3eda582c9f5bcd..043dcdb5243c00b64fc0b0c84741d8397fb27296 100644 --- a/net/minecraft/world/level/block/SculkShriekerBlock.java +++ b/net/minecraft/world/level/block/SculkShriekerBlock.java -@@ -118,7 +_,7 @@ +@@ -118,7 +118,7 @@ public class SculkShriekerBlock extends BaseEntityBlock implements SimpleWaterlo @Nullable @Override public BlockState getStateForPlacement(BlockPlaceContext context) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SlabBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SlabBlock.java.patch similarity index 73% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SlabBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SlabBlock.java.patch index 9e9c9b817..6153e8c63 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SlabBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SlabBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/SlabBlock.java b/net/minecraft/world/level/block/SlabBlock.java +index a71d72147db9766fa16bdb6254d8eb6f2f7dba7b..66b9862563932faf0044810bde7bd3fb522c109b 100644 --- a/net/minecraft/world/level/block/SlabBlock.java +++ b/net/minecraft/world/level/block/SlabBlock.java -@@ -144,4 +_,25 @@ +@@ -144,4 +144,25 @@ public class SlabBlock extends Block implements SimpleWaterloggedBlock { return false; } } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SnowLayerBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SnowLayerBlock.java.patch similarity index 56% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SnowLayerBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SnowLayerBlock.java.patch index ca87324a4..99ad56d82 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SnowLayerBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SnowLayerBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/SnowLayerBlock.java b/net/minecraft/world/level/block/SnowLayerBlock.java +index a419b295579c17b012cf3a8718d3fac96684c89b..a7cfe611171b82c4dc0fffb254fa891f1393df7c 100644 --- a/net/minecraft/world/level/block/SnowLayerBlock.java +++ b/net/minecraft/world/level/block/SnowLayerBlock.java -@@ -76,6 +_,7 @@ +@@ -76,6 +76,7 @@ public class SnowLayerBlock extends Block { @Override protected boolean canSurvive(BlockState state, LevelReader level, BlockPos pos) { BlockState blockState = level.getBlockState(pos.below()); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpawnerBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SpawnerBlock.java.patch similarity index 90% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpawnerBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SpawnerBlock.java.patch index 0b505b086..d028c2640 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpawnerBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SpawnerBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/SpawnerBlock.java b/net/minecraft/world/level/block/SpawnerBlock.java +index fda8626dc32cf8d1d42be2e30c28a53ad8808212..1eb37ed7fe5b5ab6a290016bee923f6583d6cd63 100644 --- a/net/minecraft/world/level/block/SpawnerBlock.java +++ b/net/minecraft/world/level/block/SpawnerBlock.java -@@ -14,6 +_,7 @@ +@@ -14,6 +14,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; public class SpawnerBlock extends BaseEntityBlock { @@ -8,7 +16,7 @@ public static final MapCodec CODEC = simpleCodec(SpawnerBlock::new); @Override -@@ -38,6 +_,62 @@ +@@ -38,6 +39,62 @@ public class SpawnerBlock extends BaseEntityBlock { ); } @@ -71,7 +79,7 @@ @Override protected void spawnAfterBreak(BlockState state, ServerLevel level, BlockPos pos, ItemStack stack, boolean dropExperience) { super.spawnAfterBreak(state, level, pos, stack, dropExperience); -@@ -46,6 +_,7 @@ +@@ -46,6 +103,7 @@ public class SpawnerBlock extends BaseEntityBlock { @Override public int getExpDrop(BlockState state, ServerLevel level, BlockPos pos, ItemStack stack, boolean dropExperience) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpongeBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SpongeBlock.java.patch similarity index 80% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpongeBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SpongeBlock.java.patch index ab343ffb3..5f090f4b5 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpongeBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SpongeBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/SpongeBlock.java b/net/minecraft/world/level/block/SpongeBlock.java +index c4d527cb37c940e7c6edab18d38e679c0f8cd9ac..205a5024e29e4119af35586fb526176ed72ac4bb 100644 --- a/net/minecraft/world/level/block/SpongeBlock.java +++ b/net/minecraft/world/level/block/SpongeBlock.java -@@ -53,8 +_,8 @@ +@@ -53,8 +53,8 @@ public class SpongeBlock extends Block { org.bukkit.craftbukkit.util.BlockStateListPopulator blockList = new org.bukkit.craftbukkit.util.BlockStateListPopulator(level); // CraftBukkit - Use BlockStateListPopulator BlockPos.breadthFirstTraversal( pos, @@ -11,7 +19,7 @@ (validPos, queueAdder) -> { for (Direction direction : ALL_DIRECTIONS) { queueAdder.accept(validPos.relative(direction)); -@@ -68,7 +_,7 @@ +@@ -68,7 +68,7 @@ public class SpongeBlock extends Block { BlockState blockState = blockList.getBlockState(blockPos); FluidState fluidState = blockList.getFluidState(blockPos); // CraftBukkit end @@ -20,7 +28,7 @@ return BlockPos.TraversalNodeStatus.SKIP; } else if (blockState.getBlock() instanceof BucketPickup bucketPickup && !bucketPickup.pickupBlock(null, blockList, blockPos, blockState).isEmpty()) { // CraftBukkit -@@ -76,6 +_,10 @@ +@@ -76,6 +76,10 @@ public class SpongeBlock extends Block { } else { if (blockState.getBlock() instanceof LiquidBlock) { blockList.setBlock(blockPos, Blocks.AIR.defaultBlockState(), 3); // CraftBukkit diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/StonecutterBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/StonecutterBlock.java.patch similarity index 63% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/StonecutterBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/StonecutterBlock.java.patch index 8cfd145db..26f4b4107 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/StonecutterBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/StonecutterBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/StonecutterBlock.java b/net/minecraft/world/level/block/StonecutterBlock.java +index 497470188b62356c30184226e2125abeb7359939..7591e1e55f8821887b3f68d9ce0243a33d4dc680 100644 --- a/net/minecraft/world/level/block/StonecutterBlock.java +++ b/net/minecraft/world/level/block/StonecutterBlock.java -@@ -93,4 +_,14 @@ +@@ -93,4 +93,14 @@ public class StonecutterBlock extends Block { protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) { return false; } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SugarCaneBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SugarCaneBlock.java.patch similarity index 78% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SugarCaneBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SugarCaneBlock.java.patch index f388f13ce..6162757bb 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SugarCaneBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/SugarCaneBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/SugarCaneBlock.java b/net/minecraft/world/level/block/SugarCaneBlock.java +index 4caccbd6f5df27e7cacc2cbf405d95ec13eb6cba..1b1442012e32f9dd117c5d2862a1c0323aac3897 100644 --- a/net/minecraft/world/level/block/SugarCaneBlock.java +++ b/net/minecraft/world/level/block/SugarCaneBlock.java -@@ -19,7 +_,7 @@ +@@ -19,7 +19,7 @@ import net.minecraft.world.level.material.FluidState; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -9,7 +17,7 @@ public static final MapCodec CODEC = simpleCodec(SugarCaneBlock::new); public static final IntegerProperty AGE = BlockStateProperties.AGE_15; private static final VoxelShape SHAPE = Block.column(12.0, 0.0, 16.0); -@@ -112,4 +_,34 @@ +@@ -112,4 +112,34 @@ public class SugarCaneBlock extends Block { protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(AGE); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/TurtleEggBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/TurtleEggBlock.java.patch similarity index 82% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/TurtleEggBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/TurtleEggBlock.java.patch index 165f005db..24de4d9f5 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/TurtleEggBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/TurtleEggBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/TurtleEggBlock.java b/net/minecraft/world/level/block/TurtleEggBlock.java +index b176633c58e3e0a0e898ca8d59948fd3ad2bbcdc..6fd922a7cf1c9679344af91e817469350b01de17 100644 --- a/net/minecraft/world/level/block/TurtleEggBlock.java +++ b/net/minecraft/world/level/block/TurtleEggBlock.java -@@ -156,7 +_,7 @@ +@@ -156,7 +156,7 @@ public class TurtleEggBlock extends Block { private boolean shouldUpdateHatchLevel(Level level) { float timeOfDay = level.getTimeOfDay(1.0F); @@ -9,7 +17,7 @@ } @Override -@@ -189,9 +_,32 @@ +@@ -189,9 +189,32 @@ public class TurtleEggBlock extends Block { } private boolean canDestroyEgg(ServerLevel level, Entity entity) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/TwistingVinesBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/TwistingVinesBlock.java.patch similarity index 50% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/TwistingVinesBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/TwistingVinesBlock.java.patch index 89633d8f7..208d208c6 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/TwistingVinesBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/TwistingVinesBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/TwistingVinesBlock.java b/net/minecraft/world/level/block/TwistingVinesBlock.java +index afb77747ea6966c435aca4b667bfbbc909f52232..361aaca76ae0375782310af0e03241625f08f7bd 100644 --- a/net/minecraft/world/level/block/TwistingVinesBlock.java +++ b/net/minecraft/world/level/block/TwistingVinesBlock.java -@@ -34,4 +_,11 @@ +@@ -34,4 +34,11 @@ public class TwistingVinesBlock extends GrowingPlantHeadBlock { protected boolean canGrowInto(BlockState state) { return NetherVines.isValidGrowthState(state); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/VegetationBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/VegetationBlock.java.patch similarity index 78% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/VegetationBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/VegetationBlock.java.patch index af22ad6c3..19e3ef55b 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/VegetationBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/VegetationBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/VegetationBlock.java b/net/minecraft/world/level/block/VegetationBlock.java +index 0aa7c1084fd6ed35260469572cdd914d87f3922a..a1b5e815425fccbc601c8062fcc24598512e47dd 100644 --- a/net/minecraft/world/level/block/VegetationBlock.java +++ b/net/minecraft/world/level/block/VegetationBlock.java -@@ -61,4 +_,24 @@ +@@ -61,4 +61,24 @@ public abstract class VegetationBlock extends Block { protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) { return pathComputationType == PathComputationType.AIR && !this.hasCollision || super.isPathfindable(state, pathComputationType); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/WeepingVinesBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/WeepingVinesBlock.java.patch similarity index 50% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/WeepingVinesBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/WeepingVinesBlock.java.patch index be28707f2..9eb6e166c 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/WeepingVinesBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/WeepingVinesBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/WeepingVinesBlock.java b/net/minecraft/world/level/block/WeepingVinesBlock.java +index f4ff810cdd4206711312a4fffba18f4b30a5701f..96fb69aaf9ed020a328ff609d49f88ab29a69952 100644 --- a/net/minecraft/world/level/block/WeepingVinesBlock.java +++ b/net/minecraft/world/level/block/WeepingVinesBlock.java -@@ -34,4 +_,11 @@ +@@ -34,4 +34,11 @@ public class WeepingVinesBlock extends GrowingPlantHeadBlock { protected boolean canGrowInto(BlockState state) { return NetherVines.isValidGrowthState(state); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/WitherSkullBlock.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/WitherSkullBlock.java.patch similarity index 59% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/WitherSkullBlock.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/WitherSkullBlock.java.patch index d92c3e43b..77515195c 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/WitherSkullBlock.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/WitherSkullBlock.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/WitherSkullBlock.java b/net/minecraft/world/level/block/WitherSkullBlock.java +index 99f130e303d4c6ca275bbdbf4099b65386125f51..00aad961536b8a2a69665f69eb7ce1ed5f884832 100644 --- a/net/minecraft/world/level/block/WitherSkullBlock.java +++ b/net/minecraft/world/level/block/WitherSkullBlock.java -@@ -71,6 +_,7 @@ +@@ -71,6 +71,7 @@ public class WitherSkullBlock extends SkullBlock { ); witherBoss.yBodyRot = blockPatternMatch.getForwards().getAxis() == Direction.Axis.X ? 0.0F : 90.0F; witherBoss.makeInvulnerable(); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch similarity index 71% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch index db42baa35..d561ad962 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java +index d8176f1f36f12fe179b5a63e6bf8f290a7a7461d..3dfd539f4453d9c47c99af36e7ba64400fc89a5c 100644 --- a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java +++ b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -@@ -187,6 +_,21 @@ +@@ -187,6 +187,21 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit } ItemStack itemStack = furnace.items.get(1); @@ -22,7 +30,7 @@ ItemStack itemStack1 = furnace.items.get(0); boolean flag1 = !itemStack1.isEmpty(); boolean flag2 = !itemStack.isEmpty(); -@@ -270,6 +_,8 @@ +@@ -270,6 +285,8 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit if (flag) { setChanged(level, pos, state); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeaconBlockEntity.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/BeaconBlockEntity.java.patch similarity index 73% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeaconBlockEntity.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/BeaconBlockEntity.java.patch index f196366ed..b559f0096 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeaconBlockEntity.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/BeaconBlockEntity.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/net/minecraft/world/level/block/entity/BeaconBlockEntity.java +index a517b57c504f7901e11cf435019e8e9bbb1ddbdb..9bfc2afb50a6f776441f666a2fc7ad119a758a7b 100644 --- a/net/minecraft/world/level/block/entity/BeaconBlockEntity.java +++ b/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -@@ -143,6 +_,16 @@ +@@ -143,6 +143,16 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name public double getEffectRange() { if (this.effectRange < 0) { @@ -17,7 +25,7 @@ return this.levels * 10 + 10; } else { return effectRange; -@@ -172,6 +_,7 @@ +@@ -172,6 +182,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name int y = pos.getY(); int z = pos.getZ(); BlockPos blockPos; @@ -25,7 +33,7 @@ if (blockEntity.lastCheckY < y) { blockPos = pos; blockEntity.checkingBeamSections = Lists.newArrayList(); -@@ -201,6 +_,7 @@ +@@ -201,6 +212,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name } } } else { @@ -33,7 +41,7 @@ if (section == null || blockState.getLightBlock() >= 15 && !blockState.is(Blocks.BEDROCK)) { blockEntity.checkingBeamSections.clear(); blockEntity.lastCheckY = height; -@@ -220,7 +_,7 @@ +@@ -220,7 +232,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name blockEntity.levels = updateBase(level, x, y, z); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch similarity index 76% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch index e2aa6cdd5..bdc2346cf 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java +index f0673167d6273c7689cd58ac8f51e51649cb3ad0..67c094369c81080491ec8083c43bac2fef13a0b6 100644 --- a/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java +++ b/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java -@@ -77,7 +_,7 @@ +@@ -77,7 +77,7 @@ public class BeehiveBlockEntity extends BlockEntity { "leash", "UUID" ); @@ -9,7 +17,7 @@ private static final int MIN_TICKS_BEFORE_REENTERING_HIVE = 400; private static final int MIN_OCCUPATION_TICKS_NECTAR = 2400; public static final int MIN_OCCUPATION_TICKS_NECTARLESS = 600; -@@ -152,11 +_,33 @@ +@@ -152,11 +152,33 @@ public class BeehiveBlockEntity extends BlockEntity { return list; } @@ -43,7 +51,7 @@ // Paper start - Add EntityBlockStorage clearEntities public void clearBees() { this.stored.clear(); -@@ -397,8 +_,8 @@ +@@ -397,8 +419,8 @@ public class BeehiveBlockEntity extends BlockEntity { registrar.register(DebugSubscriptions.BEE_HIVES, () -> DebugHiveInfo.pack(this)); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BlockEntity.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/BlockEntity.java.patch similarity index 71% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BlockEntity.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/BlockEntity.java.patch index a3da430cd..a9b7b3429 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BlockEntity.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/BlockEntity.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/entity/BlockEntity.java b/net/minecraft/world/level/block/entity/BlockEntity.java +index bd038bdaa00fb1e09b098b4d2809d17e2382288b..6b772326be591dafe1dc37fd81c41bcd6b0cca7d 100644 --- a/net/minecraft/world/level/block/entity/BlockEntity.java +++ b/net/minecraft/world/level/block/entity/BlockEntity.java -@@ -107,6 +_,10 @@ +@@ -107,6 +107,10 @@ public abstract class BlockEntity implements DebugValueSource { input.read("PublicBukkitValues", CompoundTag.CODEC) .ifPresent(this.persistentDataContainer::putAll); // Paper end - read persistent data container @@ -11,7 +19,7 @@ } public final void loadWithComponents(ValueInput input) { -@@ -119,6 +_,11 @@ +@@ -119,6 +123,11 @@ public abstract class BlockEntity implements DebugValueSource { } protected void saveAdditional(ValueOutput output) { @@ -23,7 +31,7 @@ } public final CompoundTag saveWithFullMetadata(HolderLookup.Provider registries) { -@@ -408,4 +_,17 @@ +@@ -408,4 +417,17 @@ public abstract class BlockEntity implements DebugValueSource { return this.blockEntity.getNameForReporting() + "@" + this.blockEntity.getBlockPos(); } } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch similarity index 85% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch index 1b2e1af50..9b5f1fb41 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/entity/ConduitBlockEntity.java b/net/minecraft/world/level/block/entity/ConduitBlockEntity.java +index d1f4a918b5fba7ad2d21fb4bec85746d6dbb69c3..ac8a959b54afd590f6c8c355c34c1b5ef0b0c45f 100644 --- a/net/minecraft/world/level/block/entity/ConduitBlockEntity.java +++ b/net/minecraft/world/level/block/entity/ConduitBlockEntity.java -@@ -151,7 +_,7 @@ +@@ -151,7 +151,7 @@ public class ConduitBlockEntity extends BlockEntity { BlockPos blockPos1 = pos.offset(i, i1, i2x); BlockState blockState = level.getBlockState(blockPos1); @@ -9,7 +17,7 @@ if (blockState.is(block)) { positions.add(blockPos1); } -@@ -166,13 +_,13 @@ +@@ -166,13 +166,13 @@ public class ConduitBlockEntity extends BlockEntity { private static void applyEffects(Level level, BlockPos pos, List positions) { // CraftBukkit start @@ -26,7 +34,7 @@ // CraftBukkit start return i; } -@@ -202,7 +_,7 @@ +@@ -202,7 +202,7 @@ public class ConduitBlockEntity extends BlockEntity { EntityReference entityReference = updateDestroyTarget(blockEntity.destroyTarget, level, pos, canDestroy); LivingEntity livingEntity = EntityReference.getLivingEntity(entityReference, level); if (damageTarget && livingEntity != null) { // CraftBukkit @@ -35,7 +43,7 @@ level.playSound( null, livingEntity.getX(), livingEntity.getY(), livingEntity.getZ(), SoundEvents.CONDUIT_ATTACK_TARGET, SoundSource.BLOCKS, 1.0F, 1.0F ); -@@ -224,20 +_,26 @@ +@@ -224,20 +224,26 @@ public class ConduitBlockEntity extends BlockEntity { return selectNewTarget(level, pos); } else { LivingEntity livingEntity = EntityReference.getLivingEntity(destroyTarget, level); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java.patch similarity index 73% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java.patch index 53c5cc2ab..e0a0838ff 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java b/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java +index f14517e2af285c02d417ca1b1dcfc669c62c98bf..3d9620d345fe39d643021bcfa20410a397e4e206 100644 --- a/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java +++ b/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java -@@ -31,6 +_,7 @@ +@@ -31,6 +31,7 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable private static final RandomSource RANDOM = RandomSource.create(); @Nullable private Component name; @@ -8,7 +16,7 @@ public EnchantingTableBlockEntity(BlockPos pos, BlockState blockState) { super(BlockEntityType.ENCHANTING_TABLE, pos, blockState); -@@ -40,12 +_,14 @@ +@@ -40,12 +41,14 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable protected void saveAdditional(ValueOutput output) { super.saveAdditional(output); output.storeNullable("CustomName", ComponentSerialization.CODEC, this.name); @@ -23,7 +31,7 @@ } public static void bookAnimationTick(Level level, BlockPos pos, BlockState state, EnchantingTableBlockEntity enchantingTable) { -@@ -137,4 +_,22 @@ +@@ -137,4 +140,22 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable public void removeComponentsFromTag(ValueOutput output) { output.discard("CustomName"); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch similarity index 88% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch index 765660670..8f82d3ea4 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/entity/SignBlockEntity.java b/net/minecraft/world/level/block/entity/SignBlockEntity.java +index 958fc0335b6fad657f71f0d6a42d6fd2c55ef48d..6c89943944d4774adad7e7a4e4357b102e34413c 100644 --- a/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/net/minecraft/world/level/block/entity/SignBlockEntity.java -@@ -149,16 +_,32 @@ +@@ -149,16 +149,32 @@ public class SignBlockEntity extends BlockEntity { return this.setText(updater.apply(text), isFrontText); } @@ -35,11 +43,10 @@ ); } } -@@ -307,6 +_,27 @@ - // CraftBukkit - this +@@ -308,6 +324,27 @@ public class SignBlockEntity extends BlockEntity { return new CommandSourceStack(commandSource, Vec3.atCenterOf(pos), Vec2.ZERO, level, 2, string, component, level.getServer(), player); // Paper - Fix commands from signs not firing command events } -+ + + // Purpur start - Signs allow color codes + public ClientboundBlockEntityDataPacket getTranslatedUpdatePacket(boolean filtered, boolean front) { + try (net.minecraft.util.ProblemReporter.ScopedCollector scopedCollector = new net.minecraft.util.ProblemReporter.ScopedCollector(this.problemPath(), LOGGER)) { @@ -60,6 +67,7 @@ + } + } + // Purpur end - Signs allow color codes - ++ @Override public ClientboundBlockEntityDataPacket getUpdatePacket() { + return ClientboundBlockEntityDataPacket.create(this); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/piston/PistonStructureResolver.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/piston/PistonStructureResolver.java.patch similarity index 65% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/piston/PistonStructureResolver.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/piston/PistonStructureResolver.java.patch index bc6293606..1313cd339 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/piston/PistonStructureResolver.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/block/piston/PistonStructureResolver.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/block/piston/PistonStructureResolver.java b/net/minecraft/world/level/block/piston/PistonStructureResolver.java +index ad143a92569f5b420ccaa2089758b2fb3b4ab7c5..5a3660e02bc805e9a35a81b8a61f07b3f20b5ba9 100644 --- a/net/minecraft/world/level/block/piston/PistonStructureResolver.java +++ b/net/minecraft/world/level/block/piston/PistonStructureResolver.java -@@ -81,7 +_,7 @@ +@@ -81,7 +81,7 @@ public class PistonStructureResolver { return true; } else { int i = 1; @@ -9,7 +17,7 @@ return false; } else { while (isSticky(blockState)) { -@@ -95,7 +_,7 @@ +@@ -95,7 +95,7 @@ public class PistonStructureResolver { break; } @@ -18,7 +26,7 @@ return false; } } -@@ -140,7 +_,7 @@ +@@ -140,7 +140,7 @@ public class PistonStructureResolver { return true; } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/EntityStorage.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/chunk/storage/EntityStorage.java.patch similarity index 56% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/EntityStorage.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/chunk/storage/EntityStorage.java.patch index accc2318d..a0065e57e 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/EntityStorage.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/chunk/storage/EntityStorage.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/chunk/storage/EntityStorage.java b/net/minecraft/world/level/chunk/storage/EntityStorage.java +index f1f8575a4b37114ced3cdb1d2ea33a36a2db44fd..2afe96a69c09decbe972332d2d38f67427d880d8 100644 --- a/net/minecraft/world/level/chunk/storage/EntityStorage.java +++ b/net/minecraft/world/level/chunk/storage/EntityStorage.java -@@ -108,6 +_,7 @@ +@@ -108,6 +108,7 @@ public class EntityStorage implements EntityPersistentStorage { } // Paper end - Entity load/save limit per chunk TagValueOutput tagValueOutput = TagValueOutput.createWithContext(scopedCollector.forChild(entity.problemPath()), entity.registryAccess()); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/RegionFileStorage.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/chunk/storage/RegionFileStorage.java.patch similarity index 68% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/RegionFileStorage.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/chunk/storage/RegionFileStorage.java.patch index a49716364..9b60af8d8 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/RegionFileStorage.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/chunk/storage/RegionFileStorage.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +index 8ea830f561f5b7d6ff6ca3c38adc7fe8e54e4cc7..0e6222214f4b5407705dcbdf4dcf574111bcf366 100644 --- a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -@@ -309,7 +_,7 @@ +@@ -309,7 +309,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise // Paper start private static void printOversizedLog(String msg, Path file, int x, int z) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/DensityFunctions.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/levelgen/DensityFunctions.java.patch similarity index 63% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/DensityFunctions.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/levelgen/DensityFunctions.java.patch index 2962a6ce4..4e65c4e4e 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/DensityFunctions.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/levelgen/DensityFunctions.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/levelgen/DensityFunctions.java b/net/minecraft/world/level/levelgen/DensityFunctions.java +index 07900150a9ec31d0e7c286787c4f10cb4cde3001..236b017e18bba53c7df37415b7681e6e4ee7f20a 100644 --- a/net/minecraft/world/level/levelgen/DensityFunctions.java +++ b/net/minecraft/world/level/levelgen/DensityFunctions.java -@@ -534,7 +_,7 @@ +@@ -534,7 +534,7 @@ public final class DensityFunctions { int i1 = z / 2; int i2 = x % 2; int i3 = z % 2; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/PhantomSpawner.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/levelgen/PhantomSpawner.java.patch similarity index 85% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/PhantomSpawner.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/levelgen/PhantomSpawner.java.patch index 5652d79c6..516b85cb1 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/PhantomSpawner.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/levelgen/PhantomSpawner.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/levelgen/PhantomSpawner.java b/net/minecraft/world/level/levelgen/PhantomSpawner.java +index 801a50ba4d202df0289339f26968e7f6bb9ca767..adb6354d6764aca56d82d8aa44383208df389e8c 100644 --- a/net/minecraft/world/level/levelgen/PhantomSpawner.java +++ b/net/minecraft/world/level/levelgen/PhantomSpawner.java -@@ -38,13 +_,13 @@ +@@ -38,13 +38,13 @@ public class PhantomSpawner implements CustomSpawner { int spawnAttemptMaxSeconds = level.paperConfig().entities.behavior.phantomsSpawnAttemptMaxSeconds; this.nextTick += (spawnAttemptMinSeconds + randomSource.nextInt(spawnAttemptMaxSeconds - spawnAttemptMinSeconds + 1)) * 20; // Paper end - Ability to control player's insomnia and phantoms @@ -17,7 +25,7 @@ ServerStatsCounter stats = serverPlayer.getStats(); int i = Mth.clamp(stats.getValue(Stats.CUSTOM.get(Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE); int i1 = 24000; -@@ -56,7 +_,7 @@ +@@ -56,7 +56,7 @@ public class PhantomSpawner implements CustomSpawner { FluidState fluidState = level.getFluidState(blockPos1); if (NaturalSpawner.isValidEmptySpawnBlock(level, blockPos1, blockState, fluidState, EntityType.PHANTOM)) { SpawnGroupData spawnGroupData = null; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/FlowingFluid.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/material/FlowingFluid.java.patch similarity index 62% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/FlowingFluid.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/material/FlowingFluid.java.patch index f174b46a5..cc41ceb01 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/FlowingFluid.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/material/FlowingFluid.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/material/FlowingFluid.java b/net/minecraft/world/level/material/FlowingFluid.java +index 85e9ec8061fc01d39977f6db314da14b1e7725e1..9685d02a9837c773094a5da5cff6fa6fcfeed86a 100644 --- a/net/minecraft/world/level/material/FlowingFluid.java +++ b/net/minecraft/world/level/material/FlowingFluid.java -@@ -233,7 +_,7 @@ +@@ -233,7 +233,7 @@ public abstract class FlowingFluid extends Fluid { } } @@ -9,16 +17,16 @@ BlockState blockState1 = level.getBlockState(mutableBlockPos.setWithOffset(pos, Direction.DOWN)); FluidState fluidState1 = blockState1.getFluidState(); if (blockState1.isSolid() || this.isSourceBlockOfThisType(fluidState1)) { -@@ -320,6 +_,12 @@ - } +@@ -321,6 +321,12 @@ public abstract class FlowingFluid extends Fluid { protected abstract boolean canConvertToSource(ServerLevel level); -+ + + // Purpur start - Implement infinite liquids + protected int getRequiredSources(Level level) { + return 2; + } + // Purpur end - Implement infinite liquids - ++ protected void spreadTo(LevelAccessor level, BlockPos pos, BlockState state, Direction direction, FluidState fluidState) { if (state.getBlock() instanceof LiquidBlockContainer liquidBlockContainer) { + liquidBlockContainer.placeLiquid(level, pos, state, fluidState); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/LavaFluid.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/material/LavaFluid.java.patch similarity index 57% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/LavaFluid.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/material/LavaFluid.java.patch index e2e16d9a1..d89773878 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/LavaFluid.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/material/LavaFluid.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/material/LavaFluid.java b/net/minecraft/world/level/material/LavaFluid.java +index 6f9e277f8ec94169e2ff8b70b63d5ef52729b069..4df0dad91a5beeb0443ac1849e7783c470aae3d3 100644 --- a/net/minecraft/world/level/material/LavaFluid.java +++ b/net/minecraft/world/level/material/LavaFluid.java -@@ -192,7 +_,7 @@ +@@ -192,7 +192,7 @@ public abstract class LavaFluid extends FlowingFluid { @Override public int getTickDelay(LevelReader level) { @@ -9,17 +17,17 @@ } @Override -@@ -213,6 +_,13 @@ - private void fizz(LevelAccessor level, BlockPos pos) { +@@ -214,6 +214,13 @@ public abstract class LavaFluid extends FlowingFluid { level.levelEvent(LevelEvent.LAVA_FIZZ, pos, 0); } -+ + + // Purpur start - Implement infinite liquids + @Override + protected int getRequiredSources(Level level) { + return level.purpurConfig.lavaInfiniteRequiredSources; + } + // Purpur end - Implement infinite liquids - ++ @Override protected boolean canConvertToSource(ServerLevel level) { + return level.getGameRules().getBoolean(GameRules.RULE_LAVA_SOURCE_CONVERSION); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/WaterFluid.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/material/WaterFluid.java.patch similarity index 56% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/WaterFluid.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/material/WaterFluid.java.patch index 3bc14791b..8eedbbdb1 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/material/WaterFluid.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/material/WaterFluid.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/material/WaterFluid.java b/net/minecraft/world/level/material/WaterFluid.java +index b00dae925acf05d11566af2d9e098c393f525fdb..19505eafb8b3aa09d7f889ecb62bcc28d835b4c8 100644 --- a/net/minecraft/world/level/material/WaterFluid.java +++ b/net/minecraft/world/level/material/WaterFluid.java -@@ -78,6 +_,13 @@ +@@ -78,6 +78,13 @@ public abstract class WaterFluid extends FlowingFluid { return level.getGameRules().getBoolean(GameRules.RULE_WATER_SOURCE_CONVERSION); } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java.patch similarity index 70% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java.patch index ef04724ea..91f645742 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java +index 9e6b2bbc1f83d32d0332f036be4f1a0e18b826bf..db6baaa698fe93aba3fbd595158b568badd6cb8a 100644 --- a/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java +++ b/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java -@@ -240,7 +_,7 @@ +@@ -240,7 +240,7 @@ public class WalkNodeEvaluator extends NodeEvaluator { if ((node == null || node.costMalus < 0.0F) && verticalDeltaLimit > 0 && (cachedPathType != PathType.FENCE || this.canWalkOverFences()) @@ -9,7 +17,7 @@ && cachedPathType != PathType.TRAPDOOR && cachedPathType != PathType.POWDER_SNOW) { node = this.tryJumpOn(x, y, z, verticalDeltaLimit, nodeFloorLevel, direction, pathType, mutableBlockPos); -@@ -493,7 +_,7 @@ +@@ -493,7 +493,7 @@ public class WalkNodeEvaluator extends NodeEvaluator { return PathType.TRAPDOOR; } else if (blockState.is(Blocks.POWDER_SNOW)) { return PathType.POWDER_SNOW; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/portal/PortalShape.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/portal/PortalShape.java.patch similarity index 64% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/portal/PortalShape.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/portal/PortalShape.java.patch index bb195b4da..aed897c35 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/portal/PortalShape.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/portal/PortalShape.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/portal/PortalShape.java b/net/minecraft/world/level/portal/PortalShape.java +index f6f171e81a805f39359213626a9d5d6a5cb9639c..6b0c931d2651e945ed70dd9169fc89bc25da4566 100644 --- a/net/minecraft/world/level/portal/PortalShape.java +++ b/net/minecraft/world/level/portal/PortalShape.java -@@ -29,7 +_,7 @@ +@@ -29,7 +29,7 @@ public class PortalShape { public static final int MAX_WIDTH = 21; private static final int MIN_HEIGHT = 3; public static final int MAX_HEIGHT = 21; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java.patch similarity index 50% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java.patch index 138758dfe..61664b065 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java +index 8ae116c71c4a7d45ae5558926bb44092e353f2a1..d96b02b173c7a9bfcb778066a53572088967dcaa 100644 --- a/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java +++ b/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java -@@ -81,6 +_,7 @@ +@@ -81,6 +81,7 @@ public class MapItemSavedData extends SavedData { public final Map decorations = Maps.newLinkedHashMap(); private final Map frameMarkers = Maps.newHashMap(); private int trackedDecorationCount; diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java.patch similarity index 64% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java.patch index bc7b09181..43ad2ec43 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java b/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java +index c4f29da30d63deb3f9eabafcf62a946ff148b6b7..f3083702286dfb7932f08e0b811eded7988cbab4 100644 --- a/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java +++ b/net/minecraft/world/level/storage/loot/functions/EnchantedCountIncreaseFunction.java -@@ -66,6 +_,11 @@ +@@ -66,6 +66,11 @@ public class EnchantedCountIncreaseFunction extends LootItemConditionalFunction Entity entity = context.getOptionalParameter(LootContextParams.ATTACKING_ENTITY); if (entity instanceof LivingEntity livingEntity) { int enchantmentLevel = EnchantmentHelper.getEnchantmentLevel(this.enchantment, livingEntity); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/phys/AABB.java.patch b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/phys/AABB.java.patch similarity index 54% rename from purpur-server/minecraft-patches/sources/net/minecraft/world/phys/AABB.java.patch rename to purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/phys/AABB.java.patch index 1545fd15f..e18be7ed1 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/phys/AABB.java.patch +++ b/purpur-server/minecraft-patches/unapplied-sources/net/minecraft/world/phys/AABB.java.patch @@ -1,6 +1,14 @@ +From 73b67b6fc4ab1a46cb7c1113a4648915bf072f56 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur File Patches + + +diff --git a/net/minecraft/world/phys/AABB.java b/net/minecraft/world/phys/AABB.java +index cffb3b7d480f72cdb9ed535f362fa60f30597523..529bd339441fde279ed81573ca5339a0837b3b87 100644 --- a/net/minecraft/world/phys/AABB.java +++ b/net/minecraft/world/phys/AABB.java -@@ -476,4 +_,10 @@ +@@ -476,4 +476,10 @@ public class AABB { return new AABB(this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ); } } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch deleted file mode 100644 index cf2b53b12..000000000 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -@@ -289,6 +_,7 @@ - @Override - public void recalculatePermissions() { - this.perm.recalculatePermissions(); -+ getHandle().canPortalInstant = hasPermission("purpur.portal.instant"); // Purpur - Add portal permission bypass - } - - @Override diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch deleted file mode 100644 index 88d5d7054..000000000 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java -@@ -258,4 +_,11 @@ - public void restock() { - getHandle().restock(); - } -+ -+ // Purpur start - Lobotomize stuck villagers -+ @Override -+ public boolean isLobotomized() { -+ return getHandle().isLobotomized(); -+ } -+ // Purpur end - Lobotomize stuck villagers - } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch deleted file mode 100644 index 33ae859ed..000000000 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java -+++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java -@@ -46,4 +_,10 @@ - } - } - -+ // Purpur start - Explorer Map API -+ @Override -+ public boolean isExplorerMap() { -+ return this.worldMap.isExplorerMap; -+ } -+ // Purpur end - Explorer Map API - } diff --git a/purpur-server/paper-patches/features/0001-Rebrand.patch b/purpur-server/paper-patches/unapplied-features/0001-Rebrand.patch similarity index 100% rename from purpur-server/paper-patches/features/0001-Rebrand.patch rename to purpur-server/paper-patches/unapplied-features/0001-Rebrand.patch diff --git a/purpur-server/paper-patches/features/0002-Ridables.patch b/purpur-server/paper-patches/unapplied-features/0002-Ridables.patch similarity index 100% rename from purpur-server/paper-patches/features/0002-Ridables.patch rename to purpur-server/paper-patches/unapplied-features/0002-Ridables.patch diff --git a/purpur-server/paper-patches/features/0003-Barrels-and-enderchests-6-rows.patch b/purpur-server/paper-patches/unapplied-features/0003-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from purpur-server/paper-patches/features/0003-Barrels-and-enderchests-6-rows.patch rename to purpur-server/paper-patches/unapplied-features/0003-Barrels-and-enderchests-6-rows.patch diff --git a/purpur-server/paper-patches/features/0004-Add-EntityTeleportHinderedEvent.patch b/purpur-server/paper-patches/unapplied-features/0004-Add-EntityTeleportHinderedEvent.patch similarity index 100% rename from purpur-server/paper-patches/features/0004-Add-EntityTeleportHinderedEvent.patch rename to purpur-server/paper-patches/unapplied-features/0004-Add-EntityTeleportHinderedEvent.patch diff --git a/purpur-server/paper-patches/features/0005-API-for-any-mob-to-burn-daylight.patch b/purpur-server/paper-patches/unapplied-features/0005-API-for-any-mob-to-burn-daylight.patch similarity index 100% rename from purpur-server/paper-patches/features/0005-API-for-any-mob-to-burn-daylight.patch rename to purpur-server/paper-patches/unapplied-features/0005-API-for-any-mob-to-burn-daylight.patch diff --git a/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/Metrics.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/Metrics.java.patch similarity index 82% rename from purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/Metrics.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/Metrics.java.patch index 4d41a9d45..c64648201 100644 --- a/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/Metrics.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/Metrics.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java +index 9f4d73fd321f6f0cd19fdd1b63068d2ea6c0816b..6194d6d8952864c71cc4017a639b818e4ecccea9 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java -@@ -593,7 +_,7 @@ +@@ -593,7 +593,7 @@ public class Metrics { boolean logFailedRequests = config.getBoolean("logFailedRequests", false); // Only start Metrics, if it's enabled in the config if (config.getBoolean("enabled", true)) { @@ -9,7 +17,7 @@ metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { String minecraftVersion = Bukkit.getVersion(); -@@ -602,16 +_,8 @@ +@@ -602,16 +602,8 @@ public class Metrics { })); metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size())); diff --git a/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java.patch similarity index 82% rename from purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java.patch index 8440b425a..d97091bdd 100644 --- a/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +index d0554ed6631535815e5932930911e3fe1dee8710..a5a7334f7a1f147945079f20aa04b4f317d9e94c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -@@ -35,7 +_,10 @@ +@@ -35,7 +35,10 @@ public class PaperVersionFetcher implements VersionFetcher { private static final Logger LOGGER = LogUtils.getClassLogger(); private static final int DISTANCE_ERROR = -1; private static final int DISTANCE_UNKNOWN = -2; @@ -12,7 +20,7 @@ @Override public long getCacheTime() { -@@ -49,7 +_,7 @@ +@@ -49,7 +52,7 @@ public class PaperVersionFetcher implements VersionFetcher { if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) { updateMessage = text("You are running a development version without access to version information", color(0xFF5300)); } else { @@ -21,7 +29,7 @@ } final @Nullable Component history = this.getHistory(); -@@ -57,7 +_,7 @@ +@@ -57,7 +60,7 @@ public class PaperVersionFetcher implements VersionFetcher { } private static Component getUpdateStatusMessage(final String repo, final ServerBuildInfo build) { @@ -30,7 +38,7 @@ final OptionalInt buildNumber = build.buildNumber(); if (buildNumber.isPresent()) { -@@ -71,10 +_,10 @@ +@@ -71,10 +74,10 @@ public class PaperVersionFetcher implements VersionFetcher { } return switch (distance) { @@ -45,7 +53,7 @@ .append(Component.newline()) .append(text("Download the new version at: ") .append(text(DOWNLOAD_PAGE, NamedTextColor.GOLD) -@@ -86,18 +_,15 @@ +@@ -86,18 +89,15 @@ public class PaperVersionFetcher implements VersionFetcher { private static int fetchDistanceFromSiteApi(final ServerBuildInfo build, final int jenkinsBuild) { try { try (final BufferedReader reader = Resources.asCharSource( @@ -68,7 +76,7 @@ return DISTANCE_ERROR; } } catch (final IOException e) { -@@ -141,6 +_,6 @@ +@@ -141,6 +141,6 @@ public class PaperVersionFetcher implements VersionFetcher { return null; } diff --git a/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/console/PaperConsole.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/console/PaperConsole.java.patch similarity index 51% rename from purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/console/PaperConsole.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/console/PaperConsole.java.patch index 43b5c7a41..e0f8ec23a 100644 --- a/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/console/PaperConsole.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/console/PaperConsole.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java +index 6ee39b534b8d992655bc0cef3c299d12cbae0034..bc7e4e5560708fea89c584b1d8b471f4966f311a 100644 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -@@ -20,7 +_,7 @@ +@@ -20,7 +20,7 @@ public final class PaperConsole extends SimpleTerminalConsole { @Override protected LineReader buildReader(LineReaderBuilder builder) { builder diff --git a/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch similarity index 61% rename from purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch index bc1fbe3c4..d7e013475 100644 --- a/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java +index 771c6b266b913c948c225e59f8e300014fc413b3..ce78c014c2467523833ccd4de19ac5fbabe915ec 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -@@ -143,6 +_,11 @@ +@@ -143,6 +143,11 @@ public class MobGoalHelper { private static final Map RENAMES = Util.make(new HashMap<>(), map -> { map.put("AbstractSkeleton$1", "AbstractSkeletonMelee"); diff --git a/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch similarity index 66% rename from purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch index 795d9b9f2..fa951844c 100644 --- a/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java +index 581e988bd7dc9d46c7df2a20073fdb90b5e63a19..1d13661305d0a3a67421ffbf2e3c577151f98955 100644 --- a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java +++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java -@@ -60,7 +_,7 @@ +@@ -60,7 +60,7 @@ public class RAMDetails extends JList { Vector vector = new Vector<>(); // Follows CraftServer#getTPS @@ -9,7 +17,7 @@ String[] tpsAvg = new String[tps.length]; for ( int g = 0; g < tps.length; g++) { -@@ -69,7 +_,7 @@ +@@ -69,7 +69,7 @@ public class RAMDetails extends JList { vector.add("Memory use: " + (data.getUsedMem() / 1024L / 1024L) + " mb (" + (data.getFree() * 100L / data.getMax()) + "% free)"); vector.add("Heap: " + (data.getTotal() / 1024L / 1024L) + " / " + (data.getMax() / 1024L / 1024L) + " mb"); vector.add("Avg tick: " + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / (double) TimeUtil.NANOSECONDS_PER_MILLISECOND) + " ms"); diff --git a/purpur-server/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch similarity index 68% rename from purpur-server/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch index 13971e34d..6a8154281 100644 --- a/purpur-server/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java +index 74ffdc823e66fc5ec027c4b7c462382bcbfe2be2..1b0ee48e28aaa68ddb1f28c23d3c5f5f40505c98 100644 --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java +++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java -@@ -31,6 +_,7 @@ +@@ -31,6 +31,7 @@ public record ServerBuildInfoImpl( private static final String ATTRIBUTE_GIT_COMMIT = "Git-Commit"; private static final String BRAND_PAPER_NAME = "Paper"; @@ -8,7 +16,7 @@ private static final String BUILD_DEV = "DEV"; -@@ -42,9 +_,9 @@ +@@ -42,9 +43,9 @@ public record ServerBuildInfoImpl( this( getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID) .map(Key::key) @@ -20,7 +28,7 @@ SharedConstants.getCurrentVersion().id(), SharedConstants.getCurrentVersion().name(), getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER) -@@ -61,7 +_,7 @@ +@@ -61,7 +62,7 @@ public record ServerBuildInfoImpl( @Override public boolean isBrandCompatible(final @NotNull Key brandId) { diff --git a/purpur-server/paper-patches/files/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch similarity index 90% rename from purpur-server/paper-patches/files/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch index 2b8d161ef..e88d56043 100644 --- a/purpur-server/paper-patches/files/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java +index 9c49bb7fb8c3ca4b62e73dcfca2669971defb181..727253cb847e56e8716bc6b17512c0eb515f34e3 100644 --- a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java +++ b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java -@@ -74,10 +_,10 @@ +@@ -74,10 +74,10 @@ public class PaperPluginsCommand { .build(); } @@ -13,7 +21,7 @@ } boolean isFirst = true; -@@ -104,15 +_,49 @@ +@@ -104,15 +104,49 @@ public class PaperPluginsCommand { return formattedSubLists; } @@ -66,7 +74,7 @@ builder.append(pluginName); -@@ -130,6 +_,23 @@ +@@ -130,6 +164,23 @@ public class PaperPluginsCommand { return componentHeader.append(Component.text(":")).build(); } @@ -90,7 +98,7 @@ private static Component asPlainComponents(final String strings) { final net.kyori.adventure.text.TextComponent.Builder builder = Component.text(); for (final String string : strings.split("\n")) { -@@ -188,25 +_,25 @@ +@@ -188,25 +239,25 @@ public class PaperPluginsCommand { final int sizePaperPlugins = paperPlugins.size(); final int sizeSpigotPlugins = spigotPlugins.size(); final int sizePlugins = sizePaperPlugins + sizeSpigotPlugins; diff --git a/purpur-server/paper-patches/files/src/main/java/io/papermc/paper/logging/SysoutCatcher.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/logging/SysoutCatcher.java.patch similarity index 62% rename from purpur-server/paper-patches/files/src/main/java/io/papermc/paper/logging/SysoutCatcher.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/logging/SysoutCatcher.java.patch index d8d9954f6..60882ecf8 100644 --- a/purpur-server/paper-patches/files/src/main/java/io/papermc/paper/logging/SysoutCatcher.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/logging/SysoutCatcher.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/io/papermc/paper/logging/SysoutCatcher.java b/src/main/java/io/papermc/paper/logging/SysoutCatcher.java +index a8e813ca89b033f061e695288b3383bdcf128531..96a377a07d8396f893954a3ba97fbf88d73faf6d 100644 --- a/src/main/java/io/papermc/paper/logging/SysoutCatcher.java +++ b/src/main/java/io/papermc/paper/logging/SysoutCatcher.java -@@ -54,9 +_,9 @@ +@@ -54,9 +54,9 @@ public final class SysoutCatcher { final JavaPlugin plugin = JavaPlugin.getProvidingPlugin(clazz); // Instead of just printing the message, send it to the plugin's logger diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java.patch similarity index 92% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java.patch index 6df6aa3cf..d4d6c2f50 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +index 872552864cd3ba5fff53d7fad6c7f16966d57a16..81684971a194a3b1f56b8d812b2e96bcfcd3860b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java -@@ -342,6 +_,12 @@ +@@ -342,6 +342,12 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa @Override public Location getLocation() { @@ -13,7 +21,7 @@ CompoundTag data = this.getData(); if (data == null) { return null; -@@ -579,4 +_,183 @@ +@@ -579,4 +585,183 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa manager.save(); } } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch similarity index 87% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch index 125da2e66..09a4f9baa 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +index 34d74014fd042f6eeafafadb6237a838b1ddd47c..7f6f35493b5a21742b827b2840c0cb611bbf0586 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -417,6 +_,20 @@ +@@ -417,6 +417,20 @@ public final class CraftServer implements Server { this.paperPluginManager = new io.papermc.paper.plugin.manager.PaperPluginManagerImpl(this, this.commandMap, pluginManager); this.pluginManager.paperPluginManager = this.paperPluginManager; // Paper end @@ -21,7 +29,7 @@ CraftRegistry.setMinecraftRegistry(console.registryAccess()); -@@ -992,6 +_,7 @@ +@@ -992,6 +1006,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot this.console.paperConfigurations.reloadConfigs(this.console); @@ -29,7 +37,7 @@ for (ServerLevel world : this.console.getAllLevels()) { // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && world.getGameRules().getBoolean(GameRules.RULE_SPAWN_MONSTERS)); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean)) -@@ -1007,6 +_,7 @@ +@@ -1007,6 +1022,7 @@ public final class CraftServer implements Server { } } world.spigotConfig.init(); // Spigot @@ -37,7 +45,7 @@ } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -1024,6 +_,7 @@ +@@ -1024,6 +1040,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.registerCommands(); // Spigot io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper this.spark.registerCommandBeforePlugins(this); // Paper - spark @@ -45,7 +53,7 @@ this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -1482,6 +_,60 @@ +@@ -1482,6 +1499,60 @@ public final class CraftServer implements Server { return true; } @@ -106,7 +114,7 @@ @Override public List getRecipesFor(ItemStack result) { Preconditions.checkArgument(result != null, "ItemStack cannot be null"); -@@ -2727,6 +_,18 @@ +@@ -2727,6 +2798,18 @@ public final class CraftServer implements Server { return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); } @@ -125,7 +133,7 @@ @Override public void restart() { CraftServer.this.restart(); -@@ -2962,4 +_,18 @@ +@@ -2962,4 +3045,18 @@ public final class CraftServer implements Server { public void allowPausing(final Plugin plugin, final boolean value) { this.console.addPluginAllowingSleep(plugin.getName(), value); } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch similarity index 82% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch index 53e0a2392..5a9a4f374 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +index e92827b83d2cd7f18ed214ce389ac423b6d2d922..4e0d9d603659718e6a56dfa46cf69fb37741ec7b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1955,6 +_,52 @@ +@@ -1955,6 +1955,52 @@ public class CraftWorld extends CraftRegionAccessor implements World { return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight()); } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/Main.java.patch similarity index 75% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/Main.java.patch index 5de962abf..2bd27c060 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/Main.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java +index 5bd6da467a1f536eb56c93ea00f98050cfaa36d0..7e99752be20868606ab31b9db831c9940f970c9b 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -164,6 +_,14 @@ +@@ -164,6 +164,14 @@ public class Main { .defaultsTo(new File[] {}) .describedAs("Jar file"); @@ -15,7 +23,7 @@ this.accepts("server-name", "Name of the server") .withRequiredArg() .ofType(String.class) -@@ -223,7 +_,7 @@ +@@ -223,7 +231,7 @@ public class Main { System.setProperty(net.minecrell.terminalconsole.TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch similarity index 80% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch index b2fe7e396..355fd5c1e 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java +index ed4692090a115d3d0a0826b10f77e903058eeec6..205c367fd5e2921d36f78ac7df5999d4adb819d0 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java -@@ -16,8 +_,15 @@ +@@ -16,8 +16,15 @@ import org.bukkit.entity.Bee; public class CraftBeehive extends CraftBlockEntityState implements Beehive { @@ -16,7 +24,7 @@ } protected CraftBeehive(CraftBeehive state, Location location) { -@@ -76,14 +_,54 @@ +@@ -76,14 +83,54 @@ public class CraftBeehive extends CraftBlockEntityState impl } } @@ -71,7 +79,7 @@ } @Override -@@ -100,6 +_,7 @@ +@@ -100,6 +147,7 @@ public class CraftBeehive extends CraftBlockEntityState impl @Override public void clearEntities() { getSnapshot().clearBees(); diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch similarity index 51% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch index 7ce19fa24..fda5b2d73 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java b/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java +index 1c448bc38fa554707e0bfb99ded70b093e49926c..77e6913358ac992b503712cccb871518770fee0b 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java -@@ -75,7 +_,7 @@ +@@ -75,7 +75,7 @@ public class CraftConduit extends CraftBlockEntityState impl public int getRange() { this.ensureNoWorldGeneration(); ConduitBlockEntity conduit = (ConduitBlockEntity) this.getBlockEntityFromWorld(); diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java.patch similarity index 60% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java.patch index 18d1a9162..c134d4301 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java +index 6e2f931b06d4ef702e0abf609a5f5bba780c5b7a..15ae2653c1809041b7ab7cb67015e82c226e9f77 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java -@@ -21,7 +_,12 @@ +@@ -21,7 +21,12 @@ public class CraftConsoleCommandSender extends ServerCommandSender implements Co @Override public void sendMessage(String message) { @@ -14,7 +22,7 @@ } @Override -@@ -88,7 +_,7 @@ +@@ -88,7 +93,7 @@ public class CraftConsoleCommandSender extends ServerCommandSender implements Co @Override public void sendMessage(final net.kyori.adventure.identity.Identity identity, final net.kyori.adventure.text.Component message, final net.kyori.adventure.audience.MessageType type) { diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java.patch similarity index 53% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java.patch index 997bb79b3..442c2b2ed 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java +index 0ea9e83df77ff6caaf62ac35a9174278c72c02a9..e7c092d6cea018ea408ead6c20863f46dab7e3e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java -@@ -55,4 +_,17 @@ +@@ -55,4 +55,17 @@ public class CraftCopperGolem extends CraftGolem implements CopperGolem, PaperSh default -> throw new IllegalStateException("Unexpected value: " + oxidizing); } } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch similarity index 50% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch index e28023a49..45245f2f1 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java +index 000c5ea5d39d5ab6e5592012ab1cc7ee547505dc..140da7078217f833f490d88faaf803ab1763115d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java -@@ -16,12 +_,12 @@ +@@ -16,12 +16,12 @@ public class CraftEndermite extends CraftMonster implements Endermite { @Override public boolean isPlayerSpawned() { diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch similarity index 57% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch index b515f8d97..dc35b4383 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +index b177e23db960323b901909a3f845a9ae0426d0df..bf3674f8984dd0ee441e04f92b747f908d629953 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -113,6 +_,18 @@ +@@ -113,6 +113,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { this.entityType = CraftEntityType.minecraftToBukkit(entity.getType()); } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch new file mode 100644 index 000000000..1425a4a46 --- /dev/null +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch @@ -0,0 +1,18 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +index 939cdd623253557712ca5284af421b3a7c33f612..aa32df881a5bfccd58d2a3b25cb4ee7373234879 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +@@ -289,6 +289,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { + @Override + public void recalculatePermissions() { + this.perm.recalculatePermissions(); ++ getHandle().canPortalInstant = hasPermission("purpur.portal.instant"); // Purpur - Add portal permission bypass + } + + @Override diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java.patch similarity index 55% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java.patch index 6acff6eeb..f23244e82 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java +index 2d7be6f2afe32fd7555640989313052d37973e61..5bafbb876e4780ff6ea0408c95007bdfcef8fa89 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java -@@ -22,4 +_,17 @@ +@@ -22,4 +22,17 @@ public class CraftIronGolem extends CraftGolem implements IronGolem { public void setPlayerCreated(boolean playerCreated) { this.getHandle().setPlayerCreated(playerCreated); } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java.patch similarity index 76% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java.patch index 7a2d0a451..caa7c7021 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +index d849e22060d0ec6d4b4ca8079ac5cec26e1a1855..4efb73372b91b8c83a6c5a2b2cb099d229db0621 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -@@ -145,4 +_,53 @@ +@@ -145,4 +145,53 @@ public class CraftItem extends CraftEntity implements Item { public UUID getThrower() { return Optionull.map(this.getHandle().thrower, EntityReference::getUUID); } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch similarity index 61% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch index c713f73ad..d4ed7430e 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +index a0fabdcb744fda303e8ba8f2b267f4f92d29f4c6..3feb3ee939ce3814aec289841bae7f928893b83e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -482,7 +_,7 @@ +@@ -482,7 +482,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { net.minecraft.server.level.ServerPlayer nmsKiller = killer == null ? null : ((CraftPlayer) killer).getHandle(); this.getHandle().setLastHurtByMob(nmsKiller); if (nmsKiller != null) { diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch similarity index 54% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch index f185fa5ca..3026a7a04 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java +index 96b88f301b558fbb22fdcd21fef36bf15623ee93..4633de441cfb011278c009096689414a951a19f4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java -@@ -86,4 +_,17 @@ +@@ -86,4 +86,17 @@ public class CraftLlama extends CraftChestedHorse implements Llama, com.destroys public Llama getCaravanTail() { return this.getHandle().caravanTail == null ? null : (Llama) this.getHandle().caravanTail.getBukkitEntity(); } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch similarity index 87% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch index 4ca54006a..e9d6dbbed 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +index 7c9f48d22b933b92f21ceea8752b3dfe6ba071b2..788bd6342c865dbd2778dcfd82c7059869dd6c98 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -579,10 +_,15 @@ +@@ -579,10 +579,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa @Override public void setPlayerListName(String name) { @@ -17,7 +25,7 @@ if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined for (ServerPlayer player : this.server.getHandle().players) { if (player.getBukkitEntity().canSee(this)) { -@@ -985,6 +_,80 @@ +@@ -985,6 +990,80 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa } } @@ -98,11 +106,10 @@ @Override public void sendBlockDamage(Location loc, float progress, org.bukkit.entity.Entity source) { Preconditions.checkArgument(source != null, "source must not be null"); -@@ -2492,6 +_,28 @@ - public float getWalkSpeed() { +@@ -2493,6 +2572,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa return this.getHandle().getAbilities().walkingSpeed * 2f; } -+ + + // Purpur start - OfflinePlayer API + @Override + public boolean teleportOffline(Location destination) { @@ -124,6 +131,7 @@ + return this.teleportAsync(destination, cause); + } + // Purpur end - OfflinePlayer API - ++ private void validateSpeed(float value) { Preconditions.checkArgument(value <= 1f && value >= -1f, "Speed value (%s) need to be between -1f and 1f", value); + } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java.patch similarity index 53% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java.patch index 0c72e0175..05e3ea90f 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java +index f03f9f94c51ef2f2eb24e4f65ec69b542b1c0a07..af60e3ef00ce1e98708d9963d466e72b6cde53cc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java -@@ -24,4 +_,17 @@ +@@ -24,4 +24,17 @@ public class CraftSnowman extends CraftGolem implements Snowman, com.destroystok public void setDerp(boolean derpMode) { this.getHandle().setPumpkin(!derpMode); } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch new file mode 100644 index 000000000..d18b51d4f --- /dev/null +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch @@ -0,0 +1,22 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +index df332b6938b81822ba0436a7999ee448913e7c22..b366e40bf63e580b065c6917e17fd5c1eca5cedb 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +@@ -258,4 +258,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager { + public void restock() { + getHandle().restock(); + } ++ ++ // Purpur start - Lobotomize stuck villagers ++ @Override ++ public boolean isLobotomized() { ++ return getHandle().isLobotomized(); ++ } ++ // Purpur end - Lobotomize stuck villagers + } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java.patch similarity index 54% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java.patch index 61556048d..1cca99c50 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java +index 2e11df97e5c8ff5fbf22ba87946d6018ac8bbbed..83b779eb0adcaf2e6d5658cddc2607f6deea6bb9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java -@@ -92,4 +_,18 @@ +@@ -92,4 +92,18 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok public void enterInvulnerabilityPhase() { this.getHandle().makeInvulnerable(); } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch similarity index 59% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch index c9d036471..49573244a 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java +index 723a8e659485850632adf173e52669e6e4f3fcc0..6317c2208fd842d4453f96a9c5dbc13ece0961f8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java -@@ -90,6 +_,18 @@ +@@ -90,6 +90,18 @@ public class CraftWolf extends CraftTameableAnimal implements Wolf { this.getHandle().setSoundVariant(CraftSoundVariant.bukkitToMinecraftHolder(soundVariant)); } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java.patch similarity index 71% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java.patch index 58b895e59..ebaca5ccf 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java +index 792cb6adf0c7a6335cc5985fce8bed2e0f1149af..5734c5caffda79383ae30df20c3defb51b87f39e 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java -@@ -19,6 +_,10 @@ +@@ -19,6 +19,10 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn private int repairCost; private int repairCostAmount; private int maximumRepairCost; @@ -11,7 +19,7 @@ public CraftInventoryAnvil(Location location, Container inventory, Container resultInventory) { super(inventory, resultInventory); -@@ -27,6 +_,10 @@ +@@ -27,6 +31,10 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn this.repairCost = CraftInventoryAnvil.DEFAULT_REPAIR_COST; this.repairCostAmount = CraftInventoryAnvil.DEFAULT_REPAIR_COST_AMOUNT; this.maximumRepairCost = CraftInventoryAnvil.DEFAULT_MAXIMUM_REPAIR_COST; @@ -22,7 +30,7 @@ } @Override -@@ -113,4 +_,30 @@ +@@ -113,4 +121,30 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn consumer.accept(cav); } } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch similarity index 94% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch index 0708b4d47..bd4246c0e 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +index 96c0797aaea76400877f5f87ede32c65a4fc8ef9..ac245e7213545994c56b8a20e8ce32d3d46e2955 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -@@ -672,4 +_,285 @@ +@@ -672,4 +672,285 @@ public final class CraftItemStack extends ItemStack { } // Paper end - data component API diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch similarity index 65% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch index b3042e1f5..f59a279f0 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java +index 4864e2016cb1d377425297fd1c52b383632cb59e..953d64d128a53eb9ec2ff55140dde5cb80326044 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java -@@ -36,6 +_,7 @@ +@@ -36,6 +36,7 @@ public interface CraftRecipe extends Recipe { stack = Ingredient.of(((RecipeChoice.MaterialChoice) bukkit).getChoices().stream().map((mat) -> CraftItemType.bukkitToMinecraft(mat))); } else if (bukkit instanceof RecipeChoice.ExactChoice) { stack = Ingredient.ofStacks(((RecipeChoice.ExactChoice) bukkit).getChoices().stream().map((mat) -> CraftItemStack.asNMSCopy(mat)).toList()); diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java.patch similarity index 59% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java.patch index 5d9234b7b..1d6d7e914 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java +index 2b3844f5ecc1bfbf3f5dab1c00d06f8be27f39e9..4e535c287137ceedd4d48047b03f4578c33467b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java -@@ -73,4 +_,26 @@ +@@ -73,4 +73,26 @@ public class CraftAnvilView extends CraftInventoryView +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java +index 0b9b29753984bebaf01e2edc6d325cd5df6c689d..b6d13bd035bc6f0f7ae6d66d7186cdb256b9194c 100644 --- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java +++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java -@@ -260,6 +_,7 @@ +@@ -260,6 +260,7 @@ public final class CraftLegacy { } static { diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch similarity index 75% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch index 990500141..8aa4f98ac 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java +index 9bc8055c36322c79077af57ab72d5493f5e65b7d..9f50bfc899d747f4e9287a646c6c6103bf501660 100644 --- a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java +++ b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java -@@ -703,4 +_,32 @@ +@@ -703,4 +703,32 @@ public class MaterialRerouting { meta.setCanPlaceOn(materials); } // Paper end diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch new file mode 100644 index 000000000..1beb17f3b --- /dev/null +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch @@ -0,0 +1,21 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java +index a573499fb96cb08d96e0b20602fc423bfd0e2f52..eb9cbc29181ffc83acd556f26f2c0b4f227808ab 100644 +--- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java ++++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java +@@ -46,4 +46,10 @@ public class CraftMapRenderer extends MapRenderer { + } + } + ++ // Purpur start - Explorer Map API ++ @Override ++ public boolean isExplorerMap() { ++ return this.worldMap.isExplorerMap; ++ } ++ // Purpur end - Explorer Map API + } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java.patch similarity index 62% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java.patch index 46d23c417..684e02f2e 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +index 7ffb7a210bf840009158d5e4364dad78221ded6c..554fc2c53b5028c8f89a0ae69a75e075ba4f4435 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -@@ -491,7 +_,7 @@ +@@ -491,7 +491,7 @@ public class CraftScheduler implements BukkitScheduler { this.parsePending(); } else { // this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(this.currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/Versioning.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/util/Versioning.java.patch similarity index 56% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/Versioning.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/util/Versioning.java.patch index 1e7ff6c8d..d0daaebca 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/Versioning.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/util/Versioning.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +index 774556a62eb240da42e84db4502e2ed43495be17..e34ceaa77c7e538c8d6bc341c4c6f450488ce426 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -@@ -11,7 +_,7 @@ +@@ -11,7 +11,7 @@ public final class Versioning { public static String getBukkitVersion() { String result = "Unknown-Version"; diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java.patch similarity index 82% rename from purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java.patch index 6106785b3..7ac4ea5fc 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java +index 8893a94d542952811ef9915ff6074b30892653d9..ae5d4348b8305f40fa87e17a202edbcb7b26e727 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java -@@ -23,7 +_,15 @@ +@@ -23,7 +23,15 @@ public final class CommandPermissions { DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "kick", "Allows the user to kick players", PermissionDefault.OP, commands); DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "stop", "Allows the user to stop the server", PermissionDefault.OP, commands); DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "list", "Allows the user to list all online players", PermissionDefault.OP, commands); diff --git a/purpur-server/paper-patches/files/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch similarity index 56% rename from purpur-server/paper-patches/files/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch index 3b87a8487..13b84fd5a 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java +index 2756ca738b99792495f4fe6128b75e03f73936f1..2e252d9b1f8323670c91abe4832f1c63303fbf88 100644 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java -@@ -47,7 +_,7 @@ +@@ -47,7 +47,7 @@ public class TicksPerSecondCommand extends Command { } TextComponent.Builder builder = text(); diff --git a/purpur-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/spigotmc/WatchdogThread.java.patch similarity index 84% rename from purpur-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch rename to purpur-server/paper-patches/unapplied-files/src/main/java/org/spigotmc/WatchdogThread.java.patch index 7dc409927..4b84d2dd9 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/java/org/spigotmc/WatchdogThread.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java +index e2dc6644ae44ce02821100275ede4b0712cf260d..bf0cda94d87e46149a21505fc67ddb9ad9af0838 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java -@@ -25,7 +_,7 @@ +@@ -25,7 +25,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre private volatile boolean stopping; private WatchdogThread(long timeoutTime, boolean restart) { @@ -9,7 +17,7 @@ this.timeoutTime = timeoutTime; this.restart = restart; this.earlyWarningEvery = Math.min(GlobalConfiguration.get().watchdog.earlyWarningEvery, timeoutTime); -@@ -75,14 +_,14 @@ +@@ -75,14 +75,14 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre this.lastEarlyWarning = currentTime; if (isLongTimeout) { logger.log(Level.SEVERE, "------------------------------"); @@ -27,7 +35,7 @@ if (net.minecraft.world.level.Level.lastPhysicsProblem != null) { logger.log(Level.SEVERE, "------------------------------"); -@@ -102,12 +_,12 @@ +@@ -102,12 +102,12 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre } // Paper end } else { @@ -42,7 +50,7 @@ FeatureHooks.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - log detailed tick information WatchdogThread.dumpThread(ManagementFactory.getThreadMXBean().getThreadInfo(MinecraftServer.getServer().serverThread.threadId(), Integer.MAX_VALUE), logger); logger.log(Level.SEVERE, "------------------------------"); -@@ -120,7 +_,7 @@ +@@ -120,7 +120,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre WatchdogThread.dumpThread(thread, logger); } } else { diff --git a/purpur-server/paper-patches/files/src/main/resources/log4j2.xml.patch b/purpur-server/paper-patches/unapplied-files/src/main/resources/log4j2.xml.patch similarity index 74% rename from purpur-server/paper-patches/files/src/main/resources/log4j2.xml.patch rename to purpur-server/paper-patches/unapplied-files/src/main/resources/log4j2.xml.patch index 8b4a31032..7e43b2942 100644 --- a/purpur-server/paper-patches/files/src/main/resources/log4j2.xml.patch +++ b/purpur-server/paper-patches/unapplied-files/src/main/resources/log4j2.xml.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml +index d2a75850af9c6ad2aca66a5f994f1b587d73eac4..a056aa167887abef9e6d531a9edd2cda433567d2 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml -@@ -2,7 +_,16 @@ +@@ -2,7 +2,16 @@ diff --git a/purpur-server/paper-patches/files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch b/purpur-server/paper-patches/unapplied-files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch similarity index 73% rename from purpur-server/paper-patches/files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch rename to purpur-server/paper-patches/unapplied-files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch index 6fb471079..3910c5f73 100644 --- a/purpur-server/paper-patches/files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch +++ b/purpur-server/paper-patches/unapplied-files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch @@ -1,6 +1,14 @@ +From 4ac95b5cb1309ac8afeb535aa9db757d9c315ec2 Mon Sep 17 00:00:00 2001 +From: File +Date: Sun, 20 Apr 1997 05:37:42 -0800 +Subject: [PATCH] purpur paperServer File Patches + + +diff --git a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java +index fe08e446e86d53cef6eecc33cd484e93adc42871..54fff448fded12cd6110583f0c255f2ca86388da 100644 --- a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java +++ b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java -@@ -46,6 +_,7 @@ +@@ -46,6 +46,7 @@ public class MinecraftCommandPermissionsTest { Set foundPerms = new HashSet<>(); for (CommandNode child : root.getChildren()) { final String vanillaPerm = VanillaCommandWrapper.getPermission(child); @@ -8,7 +16,7 @@ if (!perms.contains(vanillaPerm)) { missing.add("Missing permission for " + child.getName() + " (" + vanillaPerm + ") command"); } else { -@@ -58,6 +_,25 @@ +@@ -58,6 +59,25 @@ public class MinecraftCommandPermissionsTest { } private static final List TO_SKIP = List.of(