Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@31f0137 Add configurable height for slime spawn per world (#6310)
PaperMC/Paper@6f0762c Fix defaults for slime-spawn-height in paper config
PaperMC/Paper@cb198ff Fix chunk range int overflow
This commit is contained in:
BillyGalbreath
2022-01-12 04:24:04 -06:00
parent 0494fff566
commit 9723e945ab
4 changed files with 11 additions and 11 deletions

View File

@@ -3778,7 +3778,7 @@ index 3a3f3358c4bbd16bdcadc56c6a865ecfb942ad54..a8c6971cc7d004bdc61a2b49e4542a8a
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 5722d9b30223fb229b80f54d7fb9edf41254a7f7..8a3fcf98e4cb0a7473b198102c334e08696ab05c 100644
index 9c440625ce89686b2c250e6aaa62ed83b7015412..08935565ca3d1ee779abc491aa1e9eec13342bb5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
@@ -67,18 +67,50 @@ public class Slime extends Mob implements Enemy {
@@ -3832,7 +3832,7 @@ index 5722d9b30223fb229b80f54d7fb9edf41254a7f7..8a3fcf98e4cb0a7473b198102c334e08
this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, (entityliving) -> {
return Math.abs(entityliving.getY() - this.getY()) <= 4.0D;
}));
@@ -361,11 +393,12 @@ public class Slime extends Mob implements Enemy {
@@ -368,11 +400,12 @@ public class Slime extends Mob implements Enemy {
}
@Override
@@ -3846,7 +3846,7 @@ index 5722d9b30223fb229b80f54d7fb9edf41254a7f7..8a3fcf98e4cb0a7473b198102c334e08
}
@Nullable
@@ -398,7 +431,7 @@ public class Slime extends Mob implements Enemy {
@@ -405,7 +438,7 @@ public class Slime extends Mob implements Enemy {
return super.getDimensions(pose).scale(0.255F * (float) this.getSize());
}
@@ -3855,7 +3855,7 @@ index 5722d9b30223fb229b80f54d7fb9edf41254a7f7..8a3fcf98e4cb0a7473b198102c334e08
private float yRot;
private int jumpDelay;
@@ -417,21 +450,33 @@ public class Slime extends Mob implements Enemy {
@@ -424,21 +457,33 @@ public class Slime extends Mob implements Enemy {
}
public void setWantedMovement(double speed) {
@@ -3892,7 +3892,7 @@ index 5722d9b30223fb229b80f54d7fb9edf41254a7f7..8a3fcf98e4cb0a7473b198102c334e08
if (this.jumpDelay-- <= 0) {
this.jumpDelay = this.slime.getJumpDelay();
if (this.isAggressive) {
@@ -448,7 +493,7 @@ public class Slime extends Mob implements Enemy {
@@ -455,7 +500,7 @@ public class Slime extends Mob implements Enemy {
this.mob.setSpeed(0.0F);
}
} else {