From a86e8fe705e6f7e8e499f7012f94305c6afb33c7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 15 Oct 2022 01:45:58 -0500 Subject: [PATCH] [ci-skip] rebuild patches --- ...mobGriefing-bypass-to-everything-affected.patch | 4 ++-- patches/server/0141-One-Punch-Man.patch | 4 ++-- .../0160-Config-to-allow-for-unsafe-enchants.patch | 4 ++-- ...0-Make-anvil-cumulative-cost-configurable.patch | 4 ++-- .../0183-API-for-any-mob-to-burn-daylight.patch | 4 ++-- .../server/0212-Toggle-for-kinetic-damage.patch | 4 ++-- patches/server/0289-Remove-Mojang-Profiler.patch | 14 +++++++------- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch index 37dbcb288..3375f4061 100644 --- a/patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 7d76ccd2a73209565735a2b2efafe7fd60089e52..36d605428d6e03304295e41301b5ac9f8e8b7de9 100644 +index 4eb8920a94304dd12ea94850deda96ff841e024a..c53dd6fe11b6218a8b2985c53ca132423e09d88d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1719,7 +1719,7 @@ public abstract class LivingEntity extends Entity { +@@ -1718,7 +1718,7 @@ public abstract class LivingEntity extends Entity { boolean flag = false; if (this.dead && adversary instanceof WitherBoss) { // Paper diff --git a/patches/server/0141-One-Punch-Man.patch b/patches/server/0141-One-Punch-Man.patch index 8883b7ac0..701c6a9e8 100644 --- a/patches/server/0141-One-Punch-Man.patch +++ b/patches/server/0141-One-Punch-Man.patch @@ -5,10 +5,10 @@ Subject: [PATCH] One Punch Man! diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 36d605428d6e03304295e41301b5ac9f8e8b7de9..5e063e52a580d311227d08a6ed4ba996d5393b56 100644 +index c53dd6fe11b6218a8b2985c53ca132423e09d88d..c5f0c5ce4e20670fe2a61e4775e01094a0d36ed6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2226,6 +2226,20 @@ public abstract class LivingEntity extends Entity { +@@ -2225,6 +2225,20 @@ public abstract class LivingEntity extends Entity { ((ServerPlayer) damagesource.getEntity()).awardStat(Stats.DAMAGE_DEALT_ABSORBED, Math.round(f2 * 10.0F)); } diff --git a/patches/server/0160-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0160-Config-to-allow-for-unsafe-enchants.patch index 31aaf2062..2007460be 100644 --- a/patches/server/0160-Config-to-allow-for-unsafe-enchants.patch +++ b/patches/server/0160-Config-to-allow-for-unsafe-enchants.patch @@ -27,7 +27,7 @@ index 7c012f1e37b0085c0939797b0dae8996b4953ab8..155b0a1aa58b891e98a55e10f112f611 ++i; } else if (targets.size() == 1) { diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java -index 4b706a22859c5be41abeb6255680e1f085f050a2..1761b5b2f03a1f6557c1edceef998e8d270bf6d7 100644 +index 3dbef489a0bf27fbef95de599970141f4aa783f3..f62c39b42f449c857a75af6650ad21f9e4c3f423 100644 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java @@ -209,7 +209,8 @@ public class AnvilMenu extends ItemCombinerMenu { @@ -60,7 +60,7 @@ index 4b706a22859c5be41abeb6255680e1f085f050a2..1761b5b2f03a1f6557c1edceef998e8d i2 = enchantment.getMaxLevel(); } -@@ -335,7 +336,7 @@ public class AnvilMenu extends ItemCombinerMenu { +@@ -342,7 +343,7 @@ public class AnvilMenu extends ItemCombinerMenu { sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client this.broadcastChanges(); // Purpur start diff --git a/patches/server/0180-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0180-Make-anvil-cumulative-cost-configurable.patch index b46e6cdd4..36fc1ac06 100644 --- a/patches/server/0180-Make-anvil-cumulative-cost-configurable.patch +++ b/patches/server/0180-Make-anvil-cumulative-cost-configurable.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Make anvil cumulative cost configurable diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java -index 1761b5b2f03a1f6557c1edceef998e8d270bf6d7..4a3d216006037b308d71f7784e5fef4d6278bde7 100644 +index f62c39b42f449c857a75af6650ad21f9e4c3f423..9621f139cf6b219cfe2c1d66b13f8de41e0287b6 100644 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java -@@ -345,7 +345,7 @@ public class AnvilMenu extends ItemCombinerMenu { +@@ -352,7 +352,7 @@ public class AnvilMenu extends ItemCombinerMenu { } public static int calculateIncreasedRepairCost(int cost) { diff --git a/patches/server/0183-API-for-any-mob-to-burn-daylight.patch b/patches/server/0183-API-for-any-mob-to-burn-daylight.patch index 2716e3b4a..c5cbf3eb3 100644 --- a/patches/server/0183-API-for-any-mob-to-burn-daylight.patch +++ b/patches/server/0183-API-for-any-mob-to-burn-daylight.patch @@ -31,7 +31,7 @@ index 8304890f8e4ffb9c98e7e3d22aed30a706eedfba..9199ed472730c5ad1232770aedc8bde8 // Purpur end } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 6d91c645092786b1a5cc399a66dec37401e86e2d..eba86c0f8ec5b75b48ce60c2358912d337979960 100644 +index 3553f447f2c680799abf324b6f006af0346ab2f4..c649741c69b1ce80e822d4627527bd0147e53475 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -265,6 +265,7 @@ public abstract class LivingEntity extends Entity { @@ -62,7 +62,7 @@ index 6d91c645092786b1a5cc399a66dec37401e86e2d..eba86c0f8ec5b75b48ce60c2358912d3 } // CraftBukkit start -@@ -3485,6 +3492,27 @@ public abstract class LivingEntity extends Entity { +@@ -3484,6 +3491,27 @@ public abstract class LivingEntity extends Entity { this.hurt(DamageSource.DROWN, 1.0F); } diff --git a/patches/server/0212-Toggle-for-kinetic-damage.patch b/patches/server/0212-Toggle-for-kinetic-damage.patch index 831c151f3..e397fb7e9 100644 --- a/patches/server/0212-Toggle-for-kinetic-damage.patch +++ b/patches/server/0212-Toggle-for-kinetic-damage.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for kinetic damage diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index eba86c0f8ec5b75b48ce60c2358912d337979960..4089eee22e67a5b8f88c5a7bae0bb4d4c5b49824 100644 +index c649741c69b1ce80e822d4627527bd0147e53475..323761e13936378ae4baf7cbdc429e4f34da7dca 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2885,6 +2885,7 @@ public abstract class LivingEntity extends Entity { +@@ -2884,6 +2884,7 @@ public abstract class LivingEntity extends Entity { if (f3 > 0.0F) { this.playSound(this.getFallDamageSound((int) f3), 1.0F, 1.0F); diff --git a/patches/server/0289-Remove-Mojang-Profiler.patch b/patches/server/0289-Remove-Mojang-Profiler.patch index 022c5341e..e3baf6079 100644 --- a/patches/server/0289-Remove-Mojang-Profiler.patch +++ b/patches/server/0289-Remove-Mojang-Profiler.patch @@ -1139,7 +1139,7 @@ index a4cfb3227db4d276f08d0b644cdc9dbe36fa3d05..2fea14c75d161d542c7694373763ddfa } } else { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085e0cc6fe9 100644 +index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f994765477f01e8c6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -397,7 +397,7 @@ public abstract class LivingEntity extends Entity { @@ -1160,7 +1160,7 @@ index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085 } public boolean canSpawnSoulSpeedParticle() { -@@ -3090,10 +3090,10 @@ public abstract class LivingEntity extends Entity { +@@ -3089,10 +3089,10 @@ public abstract class LivingEntity extends Entity { } this.run += (f3 - this.run) * 0.3F; @@ -1174,7 +1174,7 @@ index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085 // Paper start - stop large pitch and yaw changes from crashing the server this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F; -@@ -3105,7 +3105,7 @@ public abstract class LivingEntity extends Entity { +@@ -3104,7 +3104,7 @@ public abstract class LivingEntity extends Entity { this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F; // Paper end @@ -1183,7 +1183,7 @@ index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085 this.animStep += f2; if (this.isFallFlying()) { ++this.fallFlyTicks; -@@ -3387,19 +3387,19 @@ public abstract class LivingEntity extends Entity { +@@ -3386,19 +3386,19 @@ public abstract class LivingEntity extends Entity { } this.setDeltaMovement(d4, d5, d6); @@ -1208,7 +1208,7 @@ index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085 if (this.jumping && this.isAffectedByFluids()) { double d7; -@@ -3426,8 +3426,8 @@ public abstract class LivingEntity extends Entity { +@@ -3425,8 +3425,8 @@ public abstract class LivingEntity extends Entity { this.noJumpDelay = 0; } @@ -1219,7 +1219,7 @@ index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085 this.xxa *= 0.98F; this.zza *= 0.98F; this.updateFallFlying(); -@@ -3436,8 +3436,8 @@ public abstract class LivingEntity extends Entity { +@@ -3435,8 +3435,8 @@ public abstract class LivingEntity extends Entity { // SpigotTimings.timerEntityAIMove.startTiming(); // Spigot // Paper this.travel(new Vec3((double) this.xxa, (double) this.yya, (double) this.zza)); // SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot // Paper @@ -1230,7 +1230,7 @@ index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085 boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES); int i; -@@ -3457,15 +3457,15 @@ public abstract class LivingEntity extends Entity { +@@ -3456,15 +3456,15 @@ public abstract class LivingEntity extends Entity { this.hurt(DamageSource.FREEZE, (float) i); }