rebuild patches

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

View File

@@ -201,7 +201,7 @@ index d28cecd9bea7c82fa675d333810e2e63a91c615e..8f8bc29d847801938e251904b8334b4b
protected ParticleOptions getInkParticle() {
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
index f0ce1e4364e1a549163c8a3a714fb20df42ae3c3..69acb18fb715c751e3c3c412dae151fb6a8239b6 100644
index 8347b13e515e306253ca2a1f79001e1aced30c2a..6515850e975e8bb303fd6ac1fb4a205dd582237f 100644
--- a/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 {
@@ -217,7 +217,7 @@ index f0ce1e4364e1a549163c8a3a714fb20df42ae3c3..69acb18fb715c751e3c3c412dae151fb
protected int lerpSteps;
protected double lerpX;
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;
}
@@ -226,7 +226,7 @@ index f0ce1e4364e1a549163c8a3a714fb20df42ae3c3..69acb18fb715c751e3c3c412dae151fb
double d0 = (double) this.getJumpPower() + this.getJumpBoostPower();
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.level.getProfiler().pop();
// 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 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());
@@ -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());
}
}
@@ -4525,7 +4525,7 @@ index 008e3b769011df76697ad0abcdde5727cef05f64..0837875231ef96ff58f2fee3e558d706
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
index 963ef9cf4dc134f5311420edd8c851eab34af3e2..0eceeb349314302c12b7fb738014299f5342b78a 100644
index f589e4376f88c7774a7fe999cad4d11a59379cd9..f5cdf3338411650add4a2eb41e0412182b1f6fdf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -156,4 +156,9 @@ public class PurpurConfig {