Skip to content

Commit 042e192

Browse files
grannygranny
committed
Updated Upstream (Pufferfish)
Upstream has released updates that appear to apply and compile correctly Pufferfish Changes: pufferfish-gg/Pufferfish@fb73c9b Updated Upstream (Paper) pufferfish-gg/Pufferfish@f572e28 Disable suffocation optimization for withers pufferfish-gg/Pufferfish@3d174ab Merge branch 'wefhy-ver/1.20' into ver/1.20 (#80) pufferfish-gg/Pufferfish@e32a780 Updated Upstream (Paper)
1 parent 423c2af commit 042e192

18 files changed

Lines changed: 77 additions & 105 deletions

‎patches/server/0001-Pufferfish-Server-Changes.patch‎

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -616,10 +616,10 @@ index 0000000000000000000000000000000000000000..020368da69b9a492155f6de6297f7473
616616
+}
617617
diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
618618
new file mode 100644
619-
index 0000000000000000000000000000000000000000..3d4bb28fe686a9ad2e4c0f75f21e6289c2ea5cf9
619+
index 0000000000000000000000000000000000000000..95d1a8a5b349f7849c040026bfa3469d03d92bfd
620620
--- /dev/null
621621
+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
622-
@@ -0,0 +1,296 @@
622+
@@ -0,0 +1,295 @@
623623
+package gg.pufferfish.pufferfish;
624624
+
625625
+import gg.pufferfish.pufferfish.simd.SIMDDetection;
@@ -904,7 +904,6 @@ index 0000000000000000000000000000000000000000..3d4bb28fe686a9ad2e4c0f75f21e6289
904904
+ "the ender dragon whenever a player places an end crystal.");
905905
+ }
906906
+
907-
+
908907
+ public static boolean disableMethodProfiler;
909908
+ public static boolean disableOutOfOrderChat;
910909
+ public static boolean suppressNullIdDisconnections;
@@ -2135,7 +2134,7 @@ index 9afc81ccb237c3655d64cdbe8a0db9a4d7791043..aa5cec6d56d7a8e80861aa4c9b4a74ca
21352134
private String descriptionId;
21362135
@Nullable
21372136
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
2138-
index e11d7283662834047b2ff81a2fd25a4263792deb..e9a31314424d9db911cd9806741222397c3072d7 100644
2137+
index e11d7283662834047b2ff81a2fd25a4263792deb..e07140ef2f4c5b0019550eb3100c724699e7a05c 100644
21392138
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
21402139
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
21412140
@@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -2151,11 +2150,11 @@ index e11d7283662834047b2ff81a2fd25a4263792deb..e9a31314424d9db911cd980674122239
21512150

21522151
if (!this.level().isClientSide) {
21532152
- if (this.isInWall()) {
2154-
+ if ((!gg.pufferfish.pufferfish.PufferfishConfig.enableSuffocationOptimization || (tickCount % 10 == 0 && couldPossiblyBeHurt(1.0F))) && this.isInWall()) { // Pufferfish - optimize suffocation
2153+
+ if (shouldCheckForSuffocation() && this.isInWall()) { // Pufferfish - optimize suffocation
21552154
this.hurt(this.damageSources().inWall(), 1.0F);
21562155
} else if (flag && !this.level().getWorldBorder().isWithinBounds(this.getBoundingBox())) {
21572156
double d0 = this.level().getWorldBorder().getDistanceToBorder(this) + this.level().getWorldBorder().getDamageSafeZone();
2158-
@@ -1369,6 +1368,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
2157+
@@ -1369,6 +1368,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
21592158
return this.getHealth() <= 0.0F;
21602159
}
21612160

@@ -2166,12 +2165,16 @@ index e11d7283662834047b2ff81a2fd25a4263792deb..e9a31314424d9db911cd980674122239
21662165
+ }
21672166
+ return true;
21682167
+ }
2168+
+
2169+
+ public boolean shouldCheckForSuffocation() {
2170+
+ return !gg.pufferfish.pufferfish.PufferfishConfig.enableSuffocationOptimization || (tickCount % 10 == 0 && couldPossiblyBeHurt(1.0F));
2171+
+ }
21692172
+ // Pufferfish end
21702173
+
21712174
@Override
21722175
public boolean hurt(DamageSource source, float amount) {
21732176
if (this.isInvulnerableTo(source)) {
2174-
@@ -1965,6 +1973,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
2177+
@@ -1965,6 +1977,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
21752178
return this.lastClimbablePos;
21762179
}
21772180

@@ -2192,7 +2195,7 @@ index e11d7283662834047b2ff81a2fd25a4263792deb..e9a31314424d9db911cd980674122239
21922195
public boolean onClimbable() {
21932196
if (this.isSpectator()) {
21942197
return false;
2195-
@@ -3651,7 +3673,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
2198+
@@ -3651,7 +3677,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
21962199
Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
21972200

21982201
// Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
@@ -2471,6 +2474,24 @@ index 247aca0b612f5079a0596350e8311c385df8ab1c..7f21d1d400c8a5615ed1a787dcb06803
24712474
this.getBrain().tick((ServerLevel) this.level(), this);
24722475
this.level().getProfiler().pop();
24732476
this.level().getProfiler().push("goatActivityUpdate");
2477+
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
2478+
index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..c65ab566c6241dd6a44bd11a449ef0c4b2f6dc65 100644
2479+
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
2480+
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
2481+
@@ -150,6 +150,13 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
2482+
this.bossEvent.setName(this.getDisplayName());
2483+
}
2484+
2485+
+ // Pufferfish start - optimize suffocation
2486+
+ @Override
2487+
+ public boolean shouldCheckForSuffocation() {
2488+
+ return true;
2489+
+ }
2490+
+ // Pufferfish end
2491+
+
2492+
@Override
2493+
protected SoundEvent getAmbientSound() {
2494+
return SoundEvents.WITHER_AMBIENT;
24742495
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
24752496
index 52196431a6538872755344859a0454a0e50c3b6e..80fc7918cb294b0d88a293bd6a920441cb55c3ad 100644
24762497
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java

‎patches/server/0008-Ridables.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ index 759713f7c646aaf1a918c87a2834a1d405385dad..c6a06e07f0b4bb29b5f4c70dfa53ff6d
191191
protected ParticleOptions getInkParticle() {
192192
return ParticleTypes.GLOW_SQUID_INK;
193193
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
194-
index e9a31314424d9db911cd9806741222397c3072d7..3c2892b9b2ade76d9d4b081ad5bce4991df11dda 100644
194+
index e07140ef2f4c5b0019550eb3100c724699e7a05c..8fdeda8939879eb070cdd8808263f4beaf144f9e 100644
195195
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
196196
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
197197
@@ -218,9 +218,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -224,7 +224,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..3c2892b9b2ade76d9d4b081ad5bce499
224224

225225
@Override
226226
protected void checkFallDamage(double heightDifference, boolean onGround, BlockState state, BlockPos landedPosition) {
227-
@@ -2686,7 +2687,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
227+
@@ -2690,7 +2691,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
228228
}
229229

230230
protected long lastJumpTime = 0L; // Paper
@@ -233,7 +233,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..3c2892b9b2ade76d9d4b081ad5bce499
233233
Vec3 vec3d = this.getDeltaMovement();
234234
// Paper start
235235
long time = System.nanoTime();
236-
@@ -3458,8 +3459,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
236+
@@ -3462,8 +3463,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
237237
this.pushEntities();
238238
this.level().getProfiler().pop();
239239
// Paper start
@@ -246,7 +246,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..3c2892b9b2ade76d9d4b081ad5bce499
246246
Location from = new Location(this.level().getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
247247
Location to = new Location (this.level().getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
248248
io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
249-
@@ -3469,6 +3472,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
249+
@@ -3473,6 +3476,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
250250
this.absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
251251
}
252252
}
@@ -2945,7 +2945,7 @@ index a24ae93efcdb2da5782d342c7697a1bb253400c7..c5100d3d8c36bf0c07f2028c5d3ec4bb
29452945
this.dragonFight.updateDragon(this);
29462946
}
29472947
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
2948-
index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..6c86411658ef0bf64cb8cf4f213112b65f2d1d90 100644
2948+
index c65ab566c6241dd6a44bd11a449ef0c4b2f6dc65..6674d1b184246ecce5270a6826b153903e4a5a88 100644
29492949
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
29502950
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
29512951
@@ -84,16 +84,30 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -3094,7 +3094,7 @@ index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..6c86411658ef0bf64cb8cf4f213112b6
30943094
this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0]));
30953095
this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 0, false, false, WitherBoss.LIVING_ENTITY_SELECTOR));
30963096
}
3097-
@@ -256,6 +370,16 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
3097+
@@ -263,6 +377,16 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
30983098

30993099
@Override
31003100
protected void customServerAiStep() {
@@ -3111,7 +3111,7 @@ index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..6c86411658ef0bf64cb8cf4f213112b6
31113111
int i;
31123112

31133113
if (this.getInvulnerableTicks() > 0) {
3114-
@@ -576,11 +700,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
3114+
@@ -583,11 +707,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
31153115
}
31163116

31173117
public int getAlternativeTarget(int headIndex) {

‎patches/server/0009-Configurable-entity-base-attributes.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ index c6a06e07f0b4bb29b5f4c70dfa53ff6db2e4e6ea..730958dab7f074930cdccb88a89aa26e
3434
protected ParticleOptions getInkParticle() {
3535
return ParticleTypes.GLOW_SQUID_INK;
3636
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
37-
index 3c2892b9b2ade76d9d4b081ad5bce4991df11dda..0d07e666f4da002a353d03844d62a0e3aac44d9d 100644
37+
index 8fdeda8939879eb070cdd8808263f4beaf144f9e..734ca15f79186cb0385b845c40ea56be7ab085cf 100644
3838
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
3939
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
4040
@@ -287,6 +287,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -743,7 +743,7 @@ index 86029716d5538e28a8845375cc23d4bf408073ff..973c5045137850905126db91238dd8e5
743743
return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
744744
}
745745
diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
746-
index 76e4b87ffc470b7b205fba0a254668f15a394034..e46751dacee17e81933345266049675d0b11ee49 100644
746+
index ffb3d8f057b09ab61b8d33b244e81d25587e6ae7..fad1b122cd3a929e60eb0f9c5b4c63a4bfae522e 100644
747747
--- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
748748
+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
749749
@@ -107,6 +107,11 @@ public class Sniffer extends Animal {
@@ -775,7 +775,7 @@ index c5100d3d8c36bf0c07f2028c5d3ec4bbe6e92256..9e85b252bedb5d0d532170e7aa57e02f
775775
return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D);
776776
}
777777
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
778-
index 6c86411658ef0bf64cb8cf4f213112b65f2d1d90..6f7ef64612d6229179545d56093efdf58a2d7978 100644
778+
index 6674d1b184246ecce5270a6826b153903e4a5a88..e6d6341f895c763fee05db3a7a7e05a68b9d36e9 100644
779779
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
780780
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
781781
@@ -112,6 +112,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -790,7 +790,7 @@ index 6c86411658ef0bf64cb8cf4f213112b65f2d1d90..6f7ef64612d6229179545d56093efdf5
790790
@Override
791791
protected PathNavigation createNavigation(Level world) {
792792
FlyingPathNavigation navigationflying = new FlyingPathNavigation(this, world);
793-
@@ -420,7 +425,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
793+
@@ -427,7 +432,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
794794

795795
this.setInvulnerableTicks(i);
796796
if (this.tickCount % 10 == 0) {

‎patches/server/0015-LivingEntity-safeFallDistance.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
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 0d07e666f4da002a353d03844d62a0e3aac44d9d..92745269118d8a0cb91cbbebdd7700f7737d2b9a 100644
8+
index 734ca15f79186cb0385b845c40ea56be7ab085cf..287189fc95067d746e8253fc2633b843a72dcd73 100644
99
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
1111
@@ -253,6 +253,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -34,7 +34,7 @@ index 0d07e666f4da002a353d03844d62a0e3aac44d9d..92745269118d8a0cb91cbbebdd7700f7
3434
double d7 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
3535
int i = (int) (150.0D * d7);
3636

37-
@@ -2054,7 +2055,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
37+
@@ -2058,7 +2059,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
3838
MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
3939
float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
4040

@@ -44,7 +44,7 @@ index 0d07e666f4da002a353d03844d62a0e3aac44d9d..92745269118d8a0cb91cbbebdd7700f7
4444
}
4545

4646
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
47-
index 296cc895fbd090b4d43807f4ca393f6dd853e0ce..8400f02a37bdef4a9f92879a6b186ebe1f2f145e 100644
47+
index 7a7466092a2cd194abec3abdb77a7c649b4b433c..fdf41f4990923aa4309febb9c0ca8009de8e16f1 100644
4848
--- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
4949
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
5050
@@ -384,7 +384,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,

‎patches/server/0042-Disable-loot-drops-on-death-by-cramming.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ Subject: [PATCH] Disable loot drops on death by cramming
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 92745269118d8a0cb91cbbebdd7700f7737d2b9a..b3699225e2dc77c6d201e361c8d447395c3f3e62 100644
8+
index 287189fc95067d746e8253fc2633b843a72dcd73..bb8ba67c7a4a4c7a641e103bd20cbc0a01dc66b2 100644
99
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
11-
@@ -1801,6 +1801,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
11+
@@ -1805,6 +1805,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
1212

1313
this.dropEquipment(); // CraftBukkit - from below
1414
if (this.shouldDropLoot() && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
1515
+ if (!(source.is(net.minecraft.world.damagesource.DamageTypes.CRAMMING) && level().purpurConfig.disableDropsOnCrammingDeath)) { // Purpur
1616
this.dropFromLootTable(source, flag);
1717
// Paper start
1818
final boolean prev = this.clearEquipmentSlots;
19-
@@ -1809,6 +1810,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
19+
@@ -1813,6 +1814,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
2020
// Paper end
2121
this.dropCustomDeathLoot(source, i, flag);
2222
this.clearEquipmentSlots = prev; // Paper

‎patches/server/0055-Configurable-void-damage-height-and-damage.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ index acce1d46d6bce9b052126c76bc1f36264df39e71..5b9ddcab26a4c962dae104c44d65d623
1818
&& (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
1919
// Paper end
2020
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
21-
index b3699225e2dc77c6d201e361c8d447395c3f3e62..b8e6d0bd2ba18d7e0bf7cd78db8f98d4f1467d71 100644
21+
index bb8ba67c7a4a4c7a641e103bd20cbc0a01dc66b2..c32a8c4b8a75f524b0f99ada0bba6de40c0aa732 100644
2222
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
2323
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
24-
@@ -2496,7 +2496,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
24+
@@ -2500,7 +2500,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
2525

2626
@Override
2727
protected void onBelowWorld() {

‎patches/server/0061-Implement-elytra-settings.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
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 b8e6d0bd2ba18d7e0bf7cd78db8f98d4f1467d71..35e3cac34a6a508fbf3971cff9ac07db48ddeaae 100644
8+
index c32a8c4b8a75f524b0f99ada0bba6de40c0aa732..4133db59cf52664354ce1a2e8bbacbad51e09861 100644
99
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
11-
@@ -3519,7 +3519,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
11+
@@ -3523,7 +3523,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
1212
int j = i / 10;
1313

1414
if (j % 2 == 0) {

‎patches/server/0079-Totems-work-in-inventory.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory
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 8c0ef795691aa17e9522b2deda794bcdf38c64b6..6edb9c371d77fa52b08f0eaf738d0cb4b0af86ce 100644
8+
index 29d523efe2222511c25c8d8a3eeff6adf2a2da0e..c75d3490dd475fc7c1bd4931841cc84888a23bac 100644
99
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
11-
@@ -1590,6 +1590,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
11+
@@ -1594,6 +1594,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
1212
}
1313
}
1414

‎patches/server/0089-Customizable-wither-health-and-healing.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: [PATCH] Customizable wither health and healing
66
Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often.
77

88
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
9-
index 6f7ef64612d6229179545d56093efdf58a2d7978..b395d5c85f26ca4252d3f8f886b2ee5a7892af5f 100644
9+
index e6d6341f895c763fee05db3a7a7e05a68b9d36e9..8796b779ac0550e32c7313b1280278de48070baf 100644
1010
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
1111
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
12-
@@ -518,8 +518,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
12+
@@ -525,8 +525,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
1313
}
1414
}
1515

0 commit comments

Comments
 (0)