Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
BillyGalbreath committed Jan 12, 2022
1 parent 0494fff commit 9723e94
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Expand Up @@ -4,7 +4,7 @@ version = 1.18.1-R0.1-SNAPSHOT
mcVersion = 1.18.1
packageVersion = 1_18_R1

paperCommit = 3ea224d12801e2ad31034922ac4bc31557be65d2
paperCommit = cb198ff9366185dd63cdd750e189a1f1017cff7f

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0001-Pufferfish-Server-Changes.patch
Expand Up @@ -2187,7 +2187,7 @@ index 38a0fb9a7c4ade9cacfd30dffabfea7e6b773981..aae2dadabedb075fd1bc712f0226882b
}
}
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 16fd37a5048ee4b2fa6760c66af6f14e8fd71f89..d2b103d94fd020295624da2eeb07653f585b586c 100644
index 0a04980a8015fe08907a040f0f3ff537267bd462..e8d9a4fc14e38d40b8a1d02752447fb98cfb4e72 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -447,7 +447,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
Expand All @@ -2199,7 +2199,7 @@ index 16fd37a5048ee4b2fa6760c66af6f14e8fd71f89..d2b103d94fd020295624da2eeb07653f
// Paper start - use distance map to optimise entity tracker
this.playerEntityTrackerTrackMaps = new com.destroystokyo.paper.util.misc.PlayerAreaMap[TRACKING_RANGE_TYPES.length];
this.entityTrackerTrackRanges = new int[TRACKING_RANGE_TYPES.length];
@@ -2356,8 +2356,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -2358,8 +2358,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
}

Expand Down Expand Up @@ -2228,7 +2228,7 @@ index 16fd37a5048ee4b2fa6760c66af6f14e8fd71f89..d2b103d94fd020295624da2eeb07653f
Iterator iterator = this.entity.getIndirectPassengers().iterator();

while (iterator.hasNext()) {
@@ -2369,6 +2389,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -2371,6 +2391,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
i = j;
}
}
Expand Down
10 changes: 5 additions & 5 deletions patches/server/0006-Ridables.patch
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand All @@ -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());
}

Expand All @@ -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) {
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0068-Item-entity-immunities.patch
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities


diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index d2b103d94fd020295624da2eeb07653f585b586c..8b04e7d83c1dfd9d3452aef069070af03a4b63a3 100644
index e8d9a4fc14e38d40b8a1d02752447fb98cfb4e72..35bb7a3502c90462eb2d67e23bddb18030f40ad1 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -2228,7 +2228,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -2230,7 +2230,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider

public class TrackedEntity {

Expand Down

0 comments on commit 9723e94

Please sign in to comment.