Skip to content

Commit a86e8fe

Browse files
BillyGalbreathBillyGalbreath
committed
[ci-skip] rebuild patches
1 parent 32e0057 commit a86e8fe

7 files changed

Lines changed: 19 additions & 19 deletions

‎patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
8-
index 7d76ccd2a73209565735a2b2efafe7fd60089e52..36d605428d6e03304295e41301b5ac9f8e8b7de9 100644
8+
index 4eb8920a94304dd12ea94850deda96ff841e024a..c53dd6fe11b6218a8b2985c53ca132423e09d88d 100644
99
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
11-
@@ -1719,7 +1719,7 @@ public abstract class LivingEntity extends Entity {
11+
@@ -1718,7 +1718,7 @@ public abstract class LivingEntity extends Entity {
1212
boolean flag = false;
1313

1414
if (this.dead && adversary instanceof WitherBoss) { // Paper

‎patches/server/0141-One-Punch-Man.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] One Punch Man!
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
8-
index 36d605428d6e03304295e41301b5ac9f8e8b7de9..5e063e52a580d311227d08a6ed4ba996d5393b56 100644
8+
index c53dd6fe11b6218a8b2985c53ca132423e09d88d..c5f0c5ce4e20670fe2a61e4775e01094a0d36ed6 100644
99
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
11-
@@ -2226,6 +2226,20 @@ public abstract class LivingEntity extends Entity {
11+
@@ -2225,6 +2225,20 @@ public abstract class LivingEntity extends Entity {
1212
((ServerPlayer) damagesource.getEntity()).awardStat(Stats.DAMAGE_DEALT_ABSORBED, Math.round(f2 * 10.0F));
1313
}
1414

‎patches/server/0160-Config-to-allow-for-unsafe-enchants.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ index 7c012f1e37b0085c0939797b0dae8996b4953ab8..155b0a1aa58b891e98a55e10f112f611
2727
++i;
2828
} else if (targets.size() == 1) {
2929
diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
30-
index 4b706a22859c5be41abeb6255680e1f085f050a2..1761b5b2f03a1f6557c1edceef998e8d270bf6d7 100644
30+
index 3dbef489a0bf27fbef95de599970141f4aa783f3..f62c39b42f449c857a75af6650ad21f9e4c3f423 100644
3131
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
3232
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
3333
@@ -209,7 +209,8 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -60,7 +60,7 @@ index 4b706a22859c5be41abeb6255680e1f085f050a2..1761b5b2f03a1f6557c1edceef998e8d
6060
i2 = enchantment.getMaxLevel();
6161
}
6262

63-
@@ -335,7 +336,7 @@ public class AnvilMenu extends ItemCombinerMenu {
63+
@@ -342,7 +343,7 @@ public class AnvilMenu extends ItemCombinerMenu {
6464
sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client
6565
this.broadcastChanges();
6666
// Purpur start

‎patches/server/0180-Make-anvil-cumulative-cost-configurable.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Make anvil cumulative cost configurable
55

66

77
diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
8-
index 1761b5b2f03a1f6557c1edceef998e8d270bf6d7..4a3d216006037b308d71f7784e5fef4d6278bde7 100644
8+
index f62c39b42f449c857a75af6650ad21f9e4c3f423..9621f139cf6b219cfe2c1d66b13f8de41e0287b6 100644
99
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
1010
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
11-
@@ -345,7 +345,7 @@ public class AnvilMenu extends ItemCombinerMenu {
11+
@@ -352,7 +352,7 @@ public class AnvilMenu extends ItemCombinerMenu {
1212
}
1313

1414
public static int calculateIncreasedRepairCost(int cost) {

‎patches/server/0183-API-for-any-mob-to-burn-daylight.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ index 8304890f8e4ffb9c98e7e3d22aed30a706eedfba..9199ed472730c5ad1232770aedc8bde8
3131
// Purpur end
3232
}
3333
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
34-
index 6d91c645092786b1a5cc399a66dec37401e86e2d..eba86c0f8ec5b75b48ce60c2358912d337979960 100644
34+
index 3553f447f2c680799abf324b6f006af0346ab2f4..c649741c69b1ce80e822d4627527bd0147e53475 100644
3535
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
3636
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
3737
@@ -265,6 +265,7 @@ public abstract class LivingEntity extends Entity {
@@ -62,7 +62,7 @@ index 6d91c645092786b1a5cc399a66dec37401e86e2d..eba86c0f8ec5b75b48ce60c2358912d3
6262
}
6363

6464
// CraftBukkit start
65-
@@ -3485,6 +3492,27 @@ public abstract class LivingEntity extends Entity {
65+
@@ -3484,6 +3491,27 @@ public abstract class LivingEntity extends Entity {
6666
this.hurt(DamageSource.DROWN, 1.0F);
6767
}
6868

‎patches/server/0212-Toggle-for-kinetic-damage.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for kinetic damage
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
8-
index eba86c0f8ec5b75b48ce60c2358912d337979960..4089eee22e67a5b8f88c5a7bae0bb4d4c5b49824 100644
8+
index c649741c69b1ce80e822d4627527bd0147e53475..323761e13936378ae4baf7cbdc429e4f34da7dca 100644
99
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
11-
@@ -2885,6 +2885,7 @@ public abstract class LivingEntity extends Entity {
11+
@@ -2884,6 +2884,7 @@ public abstract class LivingEntity extends Entity {
1212

1313
if (f3 > 0.0F) {
1414
this.playSound(this.getFallDamageSound((int) f3), 1.0F, 1.0F);

‎patches/server/0289-Remove-Mojang-Profiler.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,7 @@ index a4cfb3227db4d276f08d0b644cdc9dbe36fa3d05..2fea14c75d161d542c7694373763ddfa
11391139
}
11401140
} else {
11411141
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
1142-
index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085e0cc6fe9 100644
1142+
index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f994765477f01e8c6 100644
11431143
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
11441144
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
11451145
@@ -397,7 +397,7 @@ public abstract class LivingEntity extends Entity {
@@ -1160,7 +1160,7 @@ index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085
11601160
}
11611161

11621162
public boolean canSpawnSoulSpeedParticle() {
1163-
@@ -3090,10 +3090,10 @@ public abstract class LivingEntity extends Entity {
1163+
@@ -3089,10 +3089,10 @@ public abstract class LivingEntity extends Entity {
11641164
}
11651165

11661166
this.run += (f3 - this.run) * 0.3F;
@@ -1174,7 +1174,7 @@ index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085
11741174

11751175
// Paper start - stop large pitch and yaw changes from crashing the server
11761176
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
1177-
@@ -3105,7 +3105,7 @@ public abstract class LivingEntity extends Entity {
1177+
@@ -3104,7 +3104,7 @@ public abstract class LivingEntity extends Entity {
11781178
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
11791179
// Paper end
11801180

@@ -1183,7 +1183,7 @@ index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085
11831183
this.animStep += f2;
11841184
if (this.isFallFlying()) {
11851185
++this.fallFlyTicks;
1186-
@@ -3387,19 +3387,19 @@ public abstract class LivingEntity extends Entity {
1186+
@@ -3386,19 +3386,19 @@ public abstract class LivingEntity extends Entity {
11871187
}
11881188

11891189
this.setDeltaMovement(d4, d5, d6);
@@ -1208,7 +1208,7 @@ index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085
12081208
if (this.jumping && this.isAffectedByFluids()) {
12091209
double d7;
12101210

1211-
@@ -3426,8 +3426,8 @@ public abstract class LivingEntity extends Entity {
1211+
@@ -3425,8 +3425,8 @@ public abstract class LivingEntity extends Entity {
12121212
this.noJumpDelay = 0;
12131213
}
12141214

@@ -1219,7 +1219,7 @@ index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085
12191219
this.xxa *= 0.98F;
12201220
this.zza *= 0.98F;
12211221
this.updateFallFlying();
1222-
@@ -3436,8 +3436,8 @@ public abstract class LivingEntity extends Entity {
1222+
@@ -3435,8 +3435,8 @@ public abstract class LivingEntity extends Entity {
12231223
// SpigotTimings.timerEntityAIMove.startTiming(); // Spigot // Paper
12241224
this.travel(new Vec3((double) this.xxa, (double) this.yya, (double) this.zza));
12251225
// SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot // Paper
@@ -1230,7 +1230,7 @@ index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085
12301230
boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
12311231
int i;
12321232

1233-
@@ -3457,15 +3457,15 @@ public abstract class LivingEntity extends Entity {
1233+
@@ -3456,15 +3456,15 @@ public abstract class LivingEntity extends Entity {
12341234
this.hurt(DamageSource.FREEZE, (float) i);
12351235
}
12361236

0 commit comments

Comments
 (0)