Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Pufferfish)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@af94364 Fix slime spawners not spawning outside slime chunks (#7741)
PaperMC/Paper@6b9f7a0 Don't fire worldborder events for virtual borders (#7749)
PaperMC/Paper@8bfb1d2 Pass ServerLevel for gamerule callbacks (#7668)
PaperMC/Paper@c66b0f9 Add pre-unbreaking amount to PlayerItemDamageEvent (#7724)
PaperMC/Paper@86fb3d2 Don't send itemmeta for books with the hide option enabled (#7734)
PaperMC/Paper@c642d25 Improve update folder behavior (#7687)

Pufferfish Changes:
pufferfish-gg/Pufferfish@1bedb87 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@952b720 Add additional SIMD debug info/fix messages
pufferfish-gg/Pufferfish@54099cf Put Java 18 in SIMD error messages
This commit is contained in:
BillyGalbreath
2022-04-18 12:41:35 -05:00
parent d4c11601c7
commit e973e3cbcc
12 changed files with 46 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0006-Ridables.patch
View File

@@ -66,7 +66,7 @@ index 5c445772eb244bd31316be3f78305614c46b9363..38995873e2b4cf9e7ac83d074c817a04
public void doTick() {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index a133fd75ee9dc007d1c380771a0f7d5a1f714dcf..142437f0224e186dd74500ac88d5c1d147db3e71 100644
index 41e6543ecb8b4459af91f58ab8a3034b3a429512..835c7ca3473d34b97534998500d2820a5881bdbf 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2475,6 +2475,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -194,7 +194,7 @@ index e82a9d41a0710c0bd8a3fa2f8ee1704f7e1e56df..2ce9b08535cf3783e6823de348943300
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 6a31e29bce673e698922da3c3ba8fd4d8b0adedb..69d14a128cbd4bcfc36b3a3b6acfbf4168ffbb79 100644
index bf896f821b88415691312d5c725ed21bb2e3f024..a052d67bbcf1fc4b0a5eb44fb0f0d26e96841416 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 {
@@ -236,7 +236,7 @@ index 6a31e29bce673e698922da3c3ba8fd4d8b0adedb..69d14a128cbd4bcfc36b3a3b6acfbf41
double d0 = (double) this.getJumpPower() + this.getJumpBoostPower();
Vec3 vec3d = this.getDeltaMovement();
// Paper start
@@ -3358,8 +3359,10 @@ public abstract class LivingEntity extends Entity {
@@ -3366,8 +3367,10 @@ public abstract class LivingEntity extends Entity {
this.pushEntities();
this.level.getProfiler().pop();
// Paper start
@@ -249,7 +249,7 @@ index 6a31e29bce673e698922da3c3ba8fd4d8b0adedb..69d14a128cbd4bcfc36b3a3b6acfbf41
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());
@@ -3369,6 +3372,21 @@ public abstract class LivingEntity extends Entity {
@@ -3377,6 +3380,21 @@ public abstract class LivingEntity extends Entity {
absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
}
}
@@ -4033,7 +4033,7 @@ index 3a3f3358c4bbd16bdcadc56c6a865ecfb942ad54..e73644f453bed8523bfad47764018362
protected void defineSynchedData() {
super.defineSynchedData();
diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
index b6e78e8145ea78d532f22707c7525829c5778076..86d8150934769c886ad657877993e1b4d4ab6829 100644
index 2e819d32915941bd77034ce599eb787610a6d666..a76cc2a88a14db90901869b9bcb24e9e045501c9 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
@@ -65,18 +65,55 @@ public class Slime extends Mob implements Enemy {
@@ -4092,7 +4092,7 @@ index b6e78e8145ea78d532f22707c7525829c5778076..86d8150934769c886ad657877993e1b4
this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, (entityliving) -> {
return Math.abs(entityliving.getY() - this.getY()) <= 4.0D;
}));
@@ -366,11 +403,12 @@ public class Slime extends Mob implements Enemy {
@@ -371,11 +408,12 @@ public class Slime extends Mob implements Enemy {
}
@Override
@@ -4106,7 +4106,7 @@ index b6e78e8145ea78d532f22707c7525829c5778076..86d8150934769c886ad657877993e1b4
}
@Nullable
@@ -403,7 +441,7 @@ public class Slime extends Mob implements Enemy {
@@ -408,7 +446,7 @@ public class Slime extends Mob implements Enemy {
return super.getDimensions(pose).scale(0.255F * (float) this.getSize());
}
@@ -4115,7 +4115,7 @@ index b6e78e8145ea78d532f22707c7525829c5778076..86d8150934769c886ad657877993e1b4
private float yRot;
private int jumpDelay;
@@ -422,21 +460,33 @@ public class Slime extends Mob implements Enemy {
@@ -427,21 +465,33 @@ public class Slime extends Mob implements Enemy {
}
public void setWantedMovement(double speed) {
@@ -4152,7 +4152,7 @@ index b6e78e8145ea78d532f22707c7525829c5778076..86d8150934769c886ad657877993e1b4
if (this.jumpDelay-- <= 0) {
this.jumpDelay = this.slime.getJumpDelay();
if (this.isAggressive) {
@@ -453,7 +503,7 @@ public class Slime extends Mob implements Enemy {
@@ -458,7 +508,7 @@ public class Slime extends Mob implements Enemy {
this.mob.setSpeed(0.0F);
}
} else {