Initial 1.18 update

This commit is contained in:
Nassim Jahnke
2022-02-28 22:43:03 -07:00
parent 0fb6f13944
commit da03d4a1bc
155 changed files with 823 additions and 1298 deletions

View File

@@ -23,13 +23,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
}
public boolean isPositionEntityTicking(BlockPos pos) {
- return this.entityManager.isPositionTicking(pos);
+ return this.entityManager.isPositionTicking(ChunkPos.asLong(pos)); // Paper
- return this.entityManager.canPositionTick(pos) && this.chunkSource.chunkMap.getDistanceManager().inEntityTickingRange(ChunkPos.asLong(pos));
+ return this.entityManager.canPositionTick(ChunkPos.asLong(pos)) && this.chunkSource.chunkMap.getDistanceManager().inEntityTickingRange(ChunkPos.asLong(pos)); // Paper
}
public boolean isPositionEntityTicking(ChunkPos pos) {
- return this.entityManager.isPositionTicking(pos);
+ return this.entityManager.isPositionTicking(pos.toLong()); // Paper
public boolean isNaturalSpawningAllowed(BlockPos pos) {
- return this.entityManager.canPositionTick(pos);
+ return this.entityManager.canPositionTick(ChunkPos.asLong(pos)); // Paper
}
public boolean isNaturalSpawningAllowed(ChunkPos pos) {
- return this.entityManager.canPositionTick(pos);
+ return this.entityManager.canPositionTick(pos.toLong()); // Paper
}
private final class EntityCallbacks implements LevelCallback<Entity> {
@@ -55,10 +60,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
return this.entityGetter;
}
+ // Paper start
+ public final boolean isPositionTicking(long position) {
+ public final boolean canPositionTick(long position) {
+ return this.chunkVisibility.get(position).isTicking();
+ }
+ // Paper end
public boolean isPositionTicking(BlockPos pos) {
public boolean canPositionTick(BlockPos pos) {
return ((Visibility) this.chunkVisibility.get(ChunkPos.asLong(pos))).isTicking();