Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

rebuild patches

Browse Source
This commit is contained in:
granny
2021-09-10 13:02:28 -07:00
parent 6fc8e46f56
commit 6115484b6e
13 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0001-Airplane-Server-Changes.patch
View File

@@ -2023,7 +2023,7 @@ index 1c446dba5de89698397041ee38a2e1a00bec8a56..03371c99c34ba4b2ffde3f6da36f171b
public final String id; public final String id;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 6175360eb2b19c8197cc5b82a09030211afd838b..f0ce1e4364e1a549163c8a3a714fb20df42ae3c3 100644 index 1149a15486016ac101c5976b45b7d1c1109244ce..8347b13e515e306253ca2a1f79001e1aced30c2a 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -2034,7 +2034,7 @@ index 6175360eb2b19c8197cc5b82a09030211afd838b..f0ce1e4364e1a549163c8a3a714fb20d
public abstract class LivingEntity extends Entity { public abstract class LivingEntity extends Entity {
@@ -1828,6 +1827,20 @@ public abstract class LivingEntity extends Entity { @@ -1829,6 +1828,20 @@ public abstract class LivingEntity extends Entity {
return this.lastClimbablePos; return this.lastClimbablePos;
} }
@@ -2055,7 +2055,7 @@ index 6175360eb2b19c8197cc5b82a09030211afd838b..f0ce1e4364e1a549163c8a3a714fb20d
public boolean onClimbable() { public boolean onClimbable() {
if (this.isSpectator()) { if (this.isSpectator()) {
return false; return false;
@@ -3432,7 +3445,10 @@ public abstract class LivingEntity extends Entity { @@ -3433,7 +3446,10 @@ public abstract class LivingEntity extends Entity {
Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ()); Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
// Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists

10
patches/server/0007-Ridables.patch
View File

@@ -201,7 +201,7 @@ index d28cecd9bea7c82fa675d333810e2e63a91c615e..8f8bc29d847801938e251904b8334b4b
protected ParticleOptions getInkParticle() { protected ParticleOptions getInkParticle() {
return ParticleTypes.GLOW_SQUID_INK; return ParticleTypes.GLOW_SQUID_INK;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index f0ce1e4364e1a549163c8a3a714fb20df42ae3c3..69acb18fb715c751e3c3c412dae151fb6a8239b6 100644 index 8347b13e515e306253ca2a1f79001e1aced30c2a..6515850e975e8bb303fd6ac1fb4a205dd582237f 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -219,9 +219,9 @@ public abstract class LivingEntity extends Entity { @@ -219,9 +219,9 @@ public abstract class LivingEntity extends Entity {
@@ -217,7 +217,7 @@ index f0ce1e4364e1a549163c8a3a714fb20df42ae3c3..69acb18fb715c751e3c3c412dae151fb
protected int lerpSteps; protected int lerpSteps;
protected double lerpX; protected double lerpX;
protected double lerpY; protected double lerpY;
@@ -2584,7 +2584,7 @@ public abstract class LivingEntity extends Entity { @@ -2585,7 +2585,7 @@ public abstract class LivingEntity extends Entity {
return this.hasEffect(MobEffects.JUMP) ? (double) (0.1F * (float) (this.getEffect(MobEffects.JUMP).getAmplifier() + 1)) : 0.0D; return this.hasEffect(MobEffects.JUMP) ? (double) (0.1F * (float) (this.getEffect(MobEffects.JUMP).getAmplifier() + 1)) : 0.0D;
} }
@@ -226,7 +226,7 @@ index f0ce1e4364e1a549163c8a3a714fb20df42ae3c3..69acb18fb715c751e3c3c412dae151fb
double d0 = (double) this.getJumpPower() + this.getJumpBoostPower(); double d0 = (double) this.getJumpPower() + this.getJumpBoostPower();
Vec3 vec3d = this.getDeltaMovement(); Vec3 vec3d = this.getDeltaMovement();
@@ -3238,8 +3238,10 @@ public abstract class LivingEntity extends Entity { @@ -3239,8 +3239,10 @@ public abstract class LivingEntity extends Entity {
this.pushEntities(); this.pushEntities();
this.level.getProfiler().pop(); this.level.getProfiler().pop();
// Paper start // Paper start
@@ -239,7 +239,7 @@ index f0ce1e4364e1a549163c8a3a714fb20df42ae3c3..69acb18fb715c751e3c3c412dae151fb
Location from = new Location(this.level.getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO); Location from = new Location(this.level.getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
Location to = new Location (this.level.getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot()); Location to = new Location (this.level.getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone()); io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
@@ -3249,6 +3251,21 @@ public abstract class LivingEntity extends Entity { @@ -3250,6 +3252,21 @@ public abstract class LivingEntity extends Entity {
absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch()); absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
} }
} }
@@ -4525,7 +4525,7 @@ index 008e3b769011df76697ad0abcdde5727cef05f64..0837875231ef96ff58f2fee3e558d706
Projectile(EntityType<? extends Projectile> type, Level world) { Projectile(EntityType<? extends Projectile> type, Level world) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 963ef9cf4dc134f5311420edd8c851eab34af3e2..0eceeb349314302c12b7fb738014299f5342b78a 100644 index f589e4376f88c7774a7fe999cad4d11a59379cd9..f5cdf3338411650add4a2eb41e0412182b1f6fdf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -156,4 +156,9 @@ public class PurpurConfig { @@ -156,4 +156,9 @@ public class PurpurConfig {

4
patches/server/0016-LivingEntity-safeFallDistance.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index a7e0126d1fed75bfa810f405a4dd5b70668bf08e..8026d97279013a3fd830e9ccd579d8043ca7a3c9 100644 index 2f32bb77a31a40dc34da24dda4defe1f3b1b150f..f7446fdf4c18399a3b3ac5182f1a8fc5bde08919 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -254,6 +254,7 @@ public abstract class LivingEntity extends Entity { @@ -254,6 +254,7 @@ public abstract class LivingEntity extends Entity {
@@ -27,7 +27,7 @@ index a7e0126d1fed75bfa810f405a4dd5b70668bf08e..8026d97279013a3fd830e9ccd579d804
if (!landedState.isAir()) { if (!landedState.isAir()) {
double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D); double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
@@ -1904,7 +1905,7 @@ public abstract class LivingEntity extends Entity { @@ -1905,7 +1906,7 @@ public abstract class LivingEntity extends Entity {
MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP); MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1); float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);

4
patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable loot drops on death by cramming
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 8026d97279013a3fd830e9ccd579d8043ca7a3c9..f165e468130f219c78ea1c66f235eb32721c9100 100644 index f7446fdf4c18399a3b3ac5182f1a8fc5bde08919..56c4319ba36b3bec71f5fc5548ec2022ac49331e 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1707,8 +1707,10 @@ public abstract class LivingEntity extends Entity { @@ -1708,8 +1708,10 @@ public abstract class LivingEntity extends Entity {
this.dropEquipment(); // CraftBukkit - from below this.dropEquipment(); // CraftBukkit - from below
if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {

4
patches/server/0054-Fix-the-dead-lagging-the-server.patch
View File

@@ -17,10 +17,10 @@ index efcba8ea0ab1f25f6480fe0a3bbe1537764438aa..d946d334af4354be0f23eee40f2723fb
public void absMoveTo(double x, double y, double z) { public void absMoveTo(double x, double y, double z) {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index f165e468130f219c78ea1c66f235eb32721c9100..5529b1bcfeeb234a5629d3d7eaeb3ba759bce131 100644 index 56c4319ba36b3bec71f5fc5548ec2022ac49331e..fce1b923f33bae53141b9cffda7808d031812a06 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2897,7 +2897,7 @@ public abstract class LivingEntity extends Entity { @@ -2898,7 +2898,7 @@ public abstract class LivingEntity extends Entity {
} }
} }

4
patches/server/0066-Configurable-void-damage-height-and-damage.patch
View File

@@ -18,10 +18,10 @@ index d946d334af4354be0f23eee40f2723fb414bb844..c07ab3ec326bd43f857324679a4dae48
&& this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) { && this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) {
// Paper end // Paper end
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 5529b1bcfeeb234a5629d3d7eaeb3ba759bce131..1c75911afb5a2de6f0099f43cb0660f49792f301 100644 index fce1b923f33bae53141b9cffda7808d031812a06..3626912350c6412f386578bfd5a338e120cae7fb 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2402,7 +2402,7 @@ public abstract class LivingEntity extends Entity { @@ -2403,7 +2403,7 @@ public abstract class LivingEntity extends Entity {
@Override @Override
protected void outOfWorld() { protected void outOfWorld() {

4
patches/server/0072-Implement-elytra-settings.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 1c75911afb5a2de6f0099f43cb0660f49792f301..d08a9032a0551361e5ced4fe20cf803d68898665 100644 index 3626912350c6412f386578bfd5a338e120cae7fb..a0e9c17662682394168ffbaf8111121c0211e679 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3298,7 +3298,16 @@ public abstract class LivingEntity extends Entity { @@ -3299,7 +3299,16 @@ public abstract class LivingEntity extends Entity {
int j = i / 10; int j = i / 10;
if (j % 2 == 0) { if (j % 2 == 0) {

4
patches/server/0159-One-Punch-Man.patch
View File

@@ -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 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 10ed6cf0d1543e1fbfb54308aa785cc206abd13d..ee4f096d4b3d23981074eb6013624c85d6890b4e 100644 index ccf420a7447fdc2a466f2e6677eaacdda0e11a36..62a25189ac73ca416da421f03d00905fe9ca6bbf 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2137,6 +2137,20 @@ public abstract class LivingEntity extends Entity { @@ -2138,6 +2138,20 @@ public abstract class LivingEntity extends Entity {
((ServerPlayer) damagesource.getEntity()).awardStat(Stats.DAMAGE_DEALT_ABSORBED, Math.round(f2 * 10.0F)); ((ServerPlayer) damagesource.getEntity()).awardStat(Stats.DAMAGE_DEALT_ABSORBED, Math.round(f2 * 10.0F));
} }

4
patches/server/0204-API-for-any-mob-to-burn-daylight.patch
View File

@@ -29,7 +29,7 @@ index 20689afe1556d2b463143ebb5cdbcbd683f5e76b..6ad500cdcafd35c5c2839859afa0d246
// Purpur end // Purpur end
} }
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index d1237c85995d3aab5d9a664db6b6ef32fe10b439..c3e5ed21f67b421a645eb8d15593d18af498e40c 100644 index 6b34ed83c2ae675a8761f92a20b2ef249b09b89b..98a7f302b82ae958be13b8e2148853da38b379e3 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -264,6 +264,7 @@ public abstract class LivingEntity extends Entity { @@ -264,6 +264,7 @@ public abstract class LivingEntity extends Entity {
@@ -60,7 +60,7 @@ index d1237c85995d3aab5d9a664db6b6ef32fe10b439..c3e5ed21f67b421a645eb8d15593d18a
} }
// CraftBukkit start // CraftBukkit start
@@ -3318,6 +3325,27 @@ public abstract class LivingEntity extends Entity { @@ -3319,6 +3326,27 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.DROWN, 1.0F); this.hurt(DamageSource.DROWN, 1.0F);
} }

4
patches/server/0205-Fix-advancement-triggers-on-entity-death.patch
View File

@@ -16,7 +16,7 @@ restoring it back to the entity just before the criterion triggers run and
then finally clearing the equipment again right after the criterion is done. then finally clearing the equipment again right after the criterion is done.
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index c3e5ed21f67b421a645eb8d15593d18af498e40c..ad3ef0b1f3d6d00a0aca909812127b09302e5a8c 100644 index 98a7f302b82ae958be13b8e2148853da38b379e3..ca7b704dd25a124be28bd91d21df5e06f1df8dce 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1661,10 +1661,13 @@ public abstract class LivingEntity extends Entity { @@ -1661,10 +1661,13 @@ public abstract class LivingEntity extends Entity {
@@ -33,7 +33,7 @@ index c3e5ed21f67b421a645eb8d15593d18af498e40c..ad3ef0b1f3d6d00a0aca909812127b09
} }
if (this.isSleeping()) { if (this.isSleeping()) {
@@ -2548,6 +2551,12 @@ public abstract class LivingEntity extends Entity { @@ -2549,6 +2552,12 @@ public abstract class LivingEntity extends Entity {
@Override @Override
public abstract void setItemSlot(EquipmentSlot slot, ItemStack stack); public abstract void setItemSlot(EquipmentSlot slot, ItemStack stack);

4
patches/server/0236-Toggle-for-kinetic-damage.patch
View File

@@ -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 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index ad3ef0b1f3d6d00a0aca909812127b09302e5a8c..4ed72b06786505f61502772bba973b12c2076be0 100644 index ca7b704dd25a124be28bd91d21df5e06f1df8dce..fa951b44300f3ac26342771d9a84bea637a1d7c4 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2792,7 +2792,11 @@ public abstract class LivingEntity extends Entity { @@ -2793,7 +2793,11 @@ public abstract class LivingEntity extends Entity {
if (f4 > 0.0F) { if (f4 > 0.0F) {
this.playSound(this.getFallDamageSound((int) f4), 1.0F, 1.0F); this.playSound(this.getFallDamageSound((int) f4), 1.0F, 1.0F);

6
patches/server/0255-horses-tempted-by-gold-config.patch → patches/server/0256-horses-tempted-by-gold-config.patch
View File

@@ -17,10 +17,10 @@ index 03ae6519a523ee73cce664d85074b5f9525de6d6..206be7e1fc85fed99118020490d8494d
@Override @Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 467cc1e7166875c929b4d39f7ed3d7c2f12991e6..d4afe73a81b770d3151f21bd5d85089a2511fd1b 100644 index 702ed3dd224982989060295f3ca07a6459072c65..508166beeffe38f96e922ac523765a05a223a1e1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1496,6 +1496,7 @@ public class PurpurWorldConfig { @@ -1498,6 +1498,7 @@ public class PurpurWorldConfig {
public double horseMovementSpeedMax = 0.3375D; public double horseMovementSpeedMax = 0.3375D;
public int horseBreedingTicks = 6000; public int horseBreedingTicks = 6000;
public boolean horseStandWithRider = true; public boolean horseStandWithRider = true;
@@ -28,7 +28,7 @@ index 467cc1e7166875c929b4d39f7ed3d7c2f12991e6..d4afe73a81b770d3151f21bd5d85089a
private void horseSettings() { private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater); horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) { if (PurpurConfig.version < 10) {
@@ -1513,6 +1514,7 @@ public class PurpurWorldConfig { @@ -1515,6 +1516,7 @@ public class PurpurWorldConfig {
horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax); horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
horseBreedingTicks = getInt("mobs.horse.breeding-delay-ticks", horseBreedingTicks); horseBreedingTicks = getInt("mobs.horse.breeding-delay-ticks", horseBreedingTicks);
horseStandWithRider = getBoolean("mobs.horse.stand-with-rider", horseStandWithRider); horseStandWithRider = getBoolean("mobs.horse.stand-with-rider", horseStandWithRider);

6
patches/server/0255-llama-tempted-by-hay-config.patch → patches/server/0257-llama-tempted-by-hay-config.patch
View File

@@ -17,10 +17,10 @@ index 8f12851f220bb23102f52f523a4c5d9855a46e95..02035b4d062e4a44b8711d940cc3680c
this.goalSelector.addGoal(6, new WaterAvoidingRandomStrollGoal(this, 0.7D)); this.goalSelector.addGoal(6, new WaterAvoidingRandomStrollGoal(this, 0.7D));
this.goalSelector.addGoal(7, new LookAtPlayerGoal(this, Player.class, 6.0F)); this.goalSelector.addGoal(7, new LookAtPlayerGoal(this, Player.class, 6.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 467cc1e7166875c929b4d39f7ed3d7c2f12991e6..23e4dd0b3c6d735530cfb3d69ca8b1482d3b60b1 100644 index 508166beeffe38f96e922ac523765a05a223a1e1..66cce23e9c7927d73bc9ecf038ad6c0d1f9d534d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1587,6 +1587,7 @@ public class PurpurWorldConfig { @@ -1591,6 +1591,7 @@ public class PurpurWorldConfig {
public double llamaMovementSpeedMax = 0.175D; public double llamaMovementSpeedMax = 0.175D;
public int llamaBreedingTicks = 6000; public int llamaBreedingTicks = 6000;
public boolean llamaJoinCaravans = true; public boolean llamaJoinCaravans = true;
@@ -28,7 +28,7 @@ index 467cc1e7166875c929b4d39f7ed3d7c2f12991e6..23e4dd0b3c6d735530cfb3d69ca8b148
private void llamaSettings() { private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable); llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater); llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1605,6 +1606,7 @@ public class PurpurWorldConfig { @@ -1609,6 +1610,7 @@ public class PurpurWorldConfig {
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax); llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks); llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);
llamaJoinCaravans = getBoolean("mobs.llama.join-caravans", llamaJoinCaravans); llamaJoinCaravans = getBoolean("mobs.llama.join-caravans", llamaJoinCaravans);