move file patches to rejected directory

purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatRules.java.patch

@@ -1,20 +0,0 @@
---- a/net/minecraft/world/damagesource/CombatRules.java
-+++ b/net/minecraft/world/damagesource/CombatRules.java
-@@ -15,7 +_,7 @@
- 
-     public static float getDamageAfterAbsorb(LivingEntity entity, float damage, DamageSource damageSource, float armorValue, float armorToughness) {
-         float f = 2.0F + armorToughness / 4.0F;
--        float f1 = Mth.clamp(armorValue - damage / f, armorValue * 0.2F, 20.0F);
-+        float f1 = Mth.clamp(armorValue - damage / f, armorValue * 0.2F, org.purpurmc.purpur.PurpurConfig.limitArmor ? 20F : Float.MAX_VALUE); // Purpur - Add attribute clamping and armor limit config
-         float f2 = f1 / 25.0F;
-         ItemStack weaponItem = damageSource.getWeaponItem();
-         float f3;
-@@ -30,7 +_,7 @@
-     }
- 
-     public static float getDamageAfterMagicAbsorb(float damage, float enchantModifiers) {
--        float f = Mth.clamp(enchantModifiers, 0.0F, 20.0F);
-+        float f = Mth.clamp(enchantModifiers, 0.0F, org.purpurmc.purpur.PurpurConfig.limitArmor ? 20F : Float.MAX_VALUE); // Purpur - Add attribute clamping and armor limit config
-         return damage * (1.0F - f / 25.0F);
-     }
- }

purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatTracker.java.patch

@@ -1,27 +0,0 @@
---- a/net/minecraft/world/damagesource/CombatTracker.java
-+++ b/net/minecraft/world/damagesource/CombatTracker.java
-@@ -54,7 +_,7 @@
- 
-     private Component getMessageForAssistedFall(Entity entity, Component entityDisplayName, String hasWeaponTranslationKey, String noWeaponTranslationKey) {
-         ItemStack itemStack = entity instanceof LivingEntity livingEntity ? livingEntity.getMainHandItem() : ItemStack.EMPTY;
--        return !itemStack.isEmpty() && itemStack.has(DataComponents.CUSTOM_NAME)
-+        return !itemStack.isEmpty() && (org.purpurmc.purpur.PurpurConfig.playerDeathsAlwaysShowItem || itemStack.has(DataComponents.CUSTOM_NAME)) // Purpur - always show item in player death messages
-             ? Component.translatable(hasWeaponTranslationKey, this.mob.getDisplayName(), entityDisplayName, itemStack.getDisplayName())
-             : Component.translatable(noWeaponTranslationKey, this.mob.getDisplayName(), entityDisplayName);
-     }
-@@ -98,6 +_,15 @@
-                 Component component = ComponentUtils.wrapInSquareBrackets(Component.translatable(string + ".link")).withStyle(INTENTIONAL_GAME_DESIGN_STYLE);
-                 return Component.translatable(string + ".message", this.mob.getDisplayName(), component);
-             } else {
-+                // Purpur start - Dont run with scissors!
-+                if (damageSource.isScissors()) {
-+                    return damageSource.getLocalizedDeathMessage(org.purpurmc.purpur.PurpurConfig.deathMsgRunWithScissors, this.mob);
-+                // Purpur start - Stonecutter damage
-+                } else if (damageSource.isStonecutter()) {
-+                    return damageSource.getLocalizedDeathMessage(org.purpurmc.purpur.PurpurConfig.deathMsgStonecutter, this.mob);
-+                // Purpur end - Stonecutter damage
-+                }
-+                // Purpur end - Dont run with scissors!
-                 return damageSource.getLocalizedDeathMessage(this.mob);
-             }
-         }

purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSource.java.patch

@@ -1,73 +0,0 @@
---- a/net/minecraft/world/damagesource/DamageSource.java
-+++ b/net/minecraft/world/damagesource/DamageSource.java
-@@ -30,6 +_,8 @@
-     @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
-+    private boolean scissors = false; // Purpur - Dont run with scissors!
-+    private boolean stonecutter = false; // Purpur - Stonecutter damage
- 
-     public DamageSource knownCause(final org.bukkit.event.entity.EntityDamageEvent.DamageCause cause) {
-         final DamageSource damageSource = this.copy();
-@@ -42,6 +_,30 @@
-         return this.knownCause;
-     }
- 
-+    // Purpur start - Dont run with scissors!
-+    public DamageSource scissors() {
-+        this.knownCause(org.bukkit.event.entity.EntityDamageEvent.DamageCause.SUICIDE);
-+        this.scissors = true;
-+        return this;
-+    }
-+
-+    public boolean isScissors() {
-+        return this.scissors;
-+    }
-+    // Purpur end - Dont run with scissors!
-+
-+    // Purpur start -  - Stonecutter damage
-+    public DamageSource stonecutter() {
-+        this.knownCause(org.bukkit.event.entity.EntityDamageEvent.DamageCause.CONTACT);
-+        this.stonecutter = true;
-+        return this;
-+    }
-+
-+    public boolean isStonecutter() {
-+        return this.stonecutter;
-+    }
-+    // Purpur end - Stonecutter damage
-+
-     @Nullable
-     public Entity eventEntityDamager() {
-         return this.eventEntityDamager;
-@@ -103,6 +_,8 @@
-         damageSource.eventBlockDamager = this.eventBlockDamager;
-         damageSource.fromBlockSnapshot = this.fromBlockSnapshot;
-         damageSource.critical = this.critical;
-+        damageSource.scissors = this.isScissors(); // Purpur - Dont run with scissors!
-+        damageSource.stonecutter = this.isStonecutter(); // Purpur - Stonecutter damage
-         return damageSource;
-     }
-     // CraftBukkit end
-@@ -169,11 +_,20 @@
-         } else {
-             Component component = this.causingEntity == null ? this.directEntity.getDisplayName() : this.causingEntity.getDisplayName();
-             ItemStack itemStack = this.causingEntity instanceof LivingEntity livingEntity1 ? livingEntity1.getMainHandItem() : ItemStack.EMPTY;
--            return !itemStack.isEmpty() && itemStack.has(DataComponents.CUSTOM_NAME)
-+            return !itemStack.isEmpty() && (org.purpurmc.purpur.PurpurConfig.playerDeathsAlwaysShowItem || itemStack.has(DataComponents.CUSTOM_NAME)) // Purpur - always show item in player death messages
-                 ? Component.translatable(string + ".item", livingEntity.getDisplayName(), component, itemStack.getDisplayName())
-                 : 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());
-+        net.kyori.adventure.text.minimessage.tag.resolver.TagResolver template = net.kyori.adventure.text.minimessage.tag.resolver.Placeholder.component("player", name);
-+        net.kyori.adventure.text.Component component = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(str, template);
-+        return io.papermc.paper.adventure.PaperAdventure.asVanilla(component);
-+    }
-+    // Purpur end - Component related conveniences
- 
-     public String getMsgId() {
-         return this.type().msgId();

purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/DamageSources.java.patch

@@ -1,39 +0,0 @@
---- a/net/minecraft/world/damagesource/DamageSources.java
-+++ b/net/minecraft/world/damagesource/DamageSources.java
-@@ -42,6 +_,8 @@
-     private final DamageSource stalagmite;
-     private final DamageSource outsideBorder;
-     private final DamageSource genericKill;
-+    private final DamageSource scissors; // Purpur - Dont run with scissors!
-+    private final DamageSource stonecutter; // Purpur - Stonecutter damage
- 
-     public DamageSources(RegistryAccess registry) {
-         this.damageTypes = registry.lookupOrThrow(Registries.DAMAGE_TYPE);
-@@ -70,6 +_,8 @@
-         this.stalagmite = this.source(DamageTypes.STALAGMITE);
-         this.outsideBorder = this.source(DamageTypes.OUTSIDE_BORDER);
-         this.genericKill = this.source(DamageTypes.GENERIC_KILL);
-+        this.scissors = this.source(DamageTypes.MAGIC).scissors(); // Purpur - Dont run with scissors!
-+        this.stonecutter = this.source(DamageTypes.MAGIC).stonecutter(); // Purpur - Stonecutter damage
-     }
- 
-     private DamageSource source(ResourceKey<DamageType> damageTypeKey) {
-@@ -83,6 +_,18 @@
-     private DamageSource source(ResourceKey<DamageType> damageTypeKey, @Nullable Entity causingEntity, @Nullable Entity directEntity) {
-         return new DamageSource(this.damageTypes.getOrThrow(damageTypeKey), causingEntity, directEntity);
-     }
-+
-+    // Purpur start - Dont run with scissor
-+    public DamageSource scissors() {
-+        return this.scissors;
-+    }
-+    // Purpur end - Dont run with scissors!
-+
-+    // Purpur start - Stonecutter damage
-+    public DamageSource stonecutter() {
-+        return this.stonecutter;
-+    }
-+    // Purpur end - Stonecutter damage
- 
-     public DamageSource inFire() {
-         return this.inFire;