Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-04 15:31:45 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Dreeam
2024-03-06 07:14:37 -05:00
parent 84c9345252
commit 377da10d2e
101 changed files with 297 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
patches/server/0017-Remove-vanilla-profiler.patch
View File

@@ -599,7 +599,7 @@ index df0c15f6b5b2224d53e4f8fad42b9a1e5f33dc25..caa6dcfec13728863dcf21f9f778665b
}
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 5a7278b093e37b95fb005ad5cc3cac90ac36f8fb..f07a0008387c18dae5b133b90ed291b364428d02 100644
index 12109446fc76a39faee6cda042ca48b3fd3809f4..410818842f1029ddbe19a84d85ad20c80f681cf6 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -68,7 +68,6 @@ import net.minecraft.server.level.progress.ChunkProgressListener;
@@ -756,7 +756,7 @@ index 366c0c9b45a819f7f94ebe3e49b8ab7f9edf9ce7..20ec10b843f90d2077f49d293d65fa6e
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 3267978df4039d7b5096eee486d56345d619606d..2de2c2c09a57f46a7c7ff9603f57c104d5a911d9 100644
index 675d2a1a19296e7390ffc92edb6d071925e51647..8ffd3b1193233040013e435f26f3a3768c7ad8fd 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -78,7 +78,6 @@ import net.minecraft.util.Mth;
@@ -814,9 +814,9 @@ index 3267978df4039d7b5096eee486d56345d619606d..2de2c2c09a57f46a7c7ff9603f57c104
if (!this.isDebug() && flag) {
j = this.getGameTime();
- gameprofilerfiller.push("blockTicks");
this.blockTicks.tick(j, 65536, this::tickBlock);
this.blockTicks.tick(j, paperConfig().environment.maxBlockTicks, this::tickBlock); // Paper - configurable max block ticks
- gameprofilerfiller.popPush("fluidTicks");
this.fluidTicks.tick(j, 65536, this::tickFluid);
this.fluidTicks.tick(j, paperConfig().environment.maxFluidTicks, this::tickFluid); // Paper - configurable max fluid ticks
- gameprofilerfiller.pop();
}
this.timings.scheduledBlocks.stopTiming(); // Paper
@@ -841,7 +841,7 @@ index 3267978df4039d7b5096eee486d56345d619606d..2de2c2c09a57f46a7c7ff9603f57c104
this.handlingTick = false;
- gameprofilerfiller.pop();
boolean flag1 = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
boolean flag1 = !paperConfig().unsupportedSettings.disableWorldTickingWhenEmpty || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players // Paper - restore this
if (flag1) {
@@ -881,12 +870,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1096,10 +1096,10 @@ index 7ab57748b2f2aea1003d9b7e70e76c372aa1e432..47e75ec4a01f8a456ec6ebc13031c1f0
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 906eded9a2ab61737a30cfe89292a71237ce4eb7..b4ba0ff5a32fea0afcd987a530c4301371ec1f82 100644
index 51097f1d04d981db2823e8647b546658b8fd27c1..7b1a9b21b7f72964f9157bf02e8dbcd57785cbfb 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -820,7 +820,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -833,7 +833,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
// CraftBukkit end
public void baseTick() {
@@ -1107,7 +1107,7 @@ index 906eded9a2ab61737a30cfe89292a71237ce4eb7..b4ba0ff5a32fea0afcd987a530c43013
if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Prevent entity loading causing async lookups
this.feetBlockState = null;
if (this.isPassenger() && this.getVehicle().isRemoved()) {
@@ -881,7 +880,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -894,7 +893,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
this.firstTick = false;
@@ -1115,7 +1115,7 @@ index 906eded9a2ab61737a30cfe89292a71237ce4eb7..b4ba0ff5a32fea0afcd987a530c43013
}
public void setSharedFlagOnFire(boolean onFire) {
@@ -1100,7 +1098,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1113,7 +1111,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
}
@@ -1123,7 +1123,7 @@ index 906eded9a2ab61737a30cfe89292a71237ce4eb7..b4ba0ff5a32fea0afcd987a530c43013
if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
movement = movement.multiply(this.stuckSpeedMultiplier);
this.stuckSpeedMultiplier = Vec3.ZERO;
@@ -1109,7 +1106,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1122,7 +1119,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
// Paper start - ignore movement changes while inactive.
if (isTemporarilyActive && !(this instanceof ItemEntity || this instanceof net.minecraft.world.entity.vehicle.AbstractMinecart) && movement == getDeltaMovement() && movementType == MoverType.SELF) {
setDeltaMovement(Vec3.ZERO);
@@ -1131,7 +1131,7 @@ index 906eded9a2ab61737a30cfe89292a71237ce4eb7..b4ba0ff5a32fea0afcd987a530c43013
return;
}
// Paper end
@@ -1130,8 +1126,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1143,8 +1139,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z);
}
@@ -1140,7 +1140,7 @@ index 906eded9a2ab61737a30cfe89292a71237ce4eb7..b4ba0ff5a32fea0afcd987a530c43013
boolean flag = !Mth.equal(movement.x, vec3d1.x);
boolean flag1 = !Mth.equal(movement.z, vec3d1.z);
@@ -1149,9 +1143,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1162,9 +1156,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
BlockState iblockdata = this.level().getBlockState(blockposition);
this.checkFallDamage(vec3d1.y, this.onGround(), iblockdata, blockposition);
@@ -1151,7 +1151,7 @@ index 906eded9a2ab61737a30cfe89292a71237ce4eb7..b4ba0ff5a32fea0afcd987a530c43013
if (this.horizontalCollision) {
Vec3 vec3d2 = this.getDeltaMovement();
@@ -1287,8 +1279,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1300,8 +1292,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
if (this.isOnFire() && (this.isInPowderSnow || this.isInWaterRainOrBubble())) {
this.setRemainingFireTicks(-this.getFireImmuneTicks());
}
@@ -1160,7 +1160,7 @@ index 906eded9a2ab61737a30cfe89292a71237ce4eb7..b4ba0ff5a32fea0afcd987a530c43013
}
}
// Paper start - detailed watchdog information
@@ -3143,7 +3133,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -3159,7 +3149,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
ServerLevel worldserver1 = minecraftserver.getLevel(resourcekey);
if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
@@ -1168,7 +1168,7 @@ index 906eded9a2ab61737a30cfe89292a71237ce4eb7..b4ba0ff5a32fea0afcd987a530c43013
this.portalTime = i;
// Paper start - Add EntityPortalReadyEvent
io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER);
@@ -3161,7 +3150,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -3177,7 +3166,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
} // Paper - Add EntityPortalReadyEvent
// CraftBukkit end
@@ -1176,7 +1176,7 @@ index 906eded9a2ab61737a30cfe89292a71237ce4eb7..b4ba0ff5a32fea0afcd987a530c43013
}
this.isInsidePortal = false;
@@ -3635,14 +3623,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -3651,14 +3639,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
// Paper end - Fix item duplication and teleport issues
if (this.level() instanceof ServerLevel && !this.isRemoved()) {
@@ -1191,7 +1191,7 @@ index 906eded9a2ab61737a30cfe89292a71237ce4eb7..b4ba0ff5a32fea0afcd987a530c43013
PortalInfo shapedetectorshape = (location == null) ? this.findDimensionEntryPoint(worldserver) : new PortalInfo(new Vec3(location.x(), location.y(), location.z()), Vec3.ZERO, this.yRot, this.xRot, worldserver, null); // CraftBukkit
if (shapedetectorshape == null) {
@@ -3681,7 +3667,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -3697,7 +3683,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
this.unRide();
// CraftBukkit end
@@ -1199,7 +1199,7 @@ index 906eded9a2ab61737a30cfe89292a71237ce4eb7..b4ba0ff5a32fea0afcd987a530c43013
// Paper start - Fix item duplication and teleport issues
if (this instanceof Mob) {
((Mob) this).dropLeash(true, true); // Paper drop lead
@@ -3708,10 +3693,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -3724,10 +3709,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
this.removeAfterChangingDimensions();
@@ -1211,10 +1211,10 @@ index 906eded9a2ab61737a30cfe89292a71237ce4eb7..b4ba0ff5a32fea0afcd987a530c43013
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index aceee33eebd4d5f89e62a42910ec51843f33843b..a0da290019b10f424771309c0ccc84689c753c90 100644
index 23570a0b1227a840b9c1e6ae326827ea655bb5f7..8e375654bf60e1b4f82718e23968c3ab1f799c34 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -404,7 +404,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -405,7 +405,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
super.baseTick();
@@ -1222,7 +1222,7 @@ index aceee33eebd4d5f89e62a42910ec51843f33843b..a0da290019b10f424771309c0ccc8468
if (this.fireImmune() || this.level().isClientSide) {
this.clearFire();
}
@@ -506,7 +505,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -507,7 +506,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.yHeadRotO = this.yHeadRot;
this.yRotO = this.getYRot();
this.xRotO = this.getXRot();
@@ -1230,7 +1230,7 @@ index aceee33eebd4d5f89e62a42910ec51843f33843b..a0da290019b10f424771309c0ccc8468
}
public boolean canSpawnSoulSpeedParticle() {
@@ -3089,10 +3087,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3097,10 +3095,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1241,7 +1241,7 @@ index aceee33eebd4d5f89e62a42910ec51843f33843b..a0da290019b10f424771309c0ccc8468
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3104,7 +3099,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3112,7 +3107,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end
@@ -1249,7 +1249,7 @@ index aceee33eebd4d5f89e62a42910ec51843f33843b..a0da290019b10f424771309c0ccc8468
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3399,19 +3393,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3407,19 +3401,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.setDeltaMovement(d0, d1, d2);
@@ -1269,7 +1269,7 @@ index aceee33eebd4d5f89e62a42910ec51843f33843b..a0da290019b10f424771309c0ccc8468
if (this.jumping && this.isAffectedByFluids()) {
double d3;
@@ -3438,8 +3427,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3446,8 +3435,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.noJumpDelay = 0;
}
@@ -1278,7 +1278,7 @@ index aceee33eebd4d5f89e62a42910ec51843f33843b..a0da290019b10f424771309c0ccc8468
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3466,8 +3453,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3474,8 +3461,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.travel(vec3d1);
}
@@ -1287,7 +1287,7 @@ index aceee33eebd4d5f89e62a42910ec51843f33843b..a0da290019b10f424771309c0ccc8468
if (!this.level().isClientSide && !this.isDeadOrDying() && !this.freezeLocked) { // Paper - Freeze Tick Lock API
int i = this.getTicksFrozen();
@@ -3484,15 +3469,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3492,15 +3477,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().freeze(), 1.0F);
}
@@ -1304,10 +1304,10 @@ index aceee33eebd4d5f89e62a42910ec51843f33843b..a0da290019b10f424771309c0ccc8468
if (((ServerLevel) this.level()).hasEntityMoveEvent && !(this instanceof net.minecraft.world.entity.player.Player)) {
if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index fa0b78139fecc0245e168ebeb4172ea2531a3fec..2dfdeec25ef0d9a004601fd9b5050c881156de26 100644
index 2439f8d48daca7329049436414f06a36b4b79029..dee9ee5e5917f48b8e1c078710c6d67de6de78d5 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -146,8 +146,10 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -147,8 +147,10 @@ public abstract class Mob extends LivingEntity implements Targeting {
this.pathfindingMalus = Maps.newEnumMap(BlockPathTypes.class);
this.restrictCenter = BlockPos.ZERO;
this.restrictRadius = -1.0F;
@@ -1320,7 +1320,7 @@ index fa0b78139fecc0245e168ebeb4172ea2531a3fec..2dfdeec25ef0d9a004601fd9b5050c88
this.lookControl = new LookControl(this);
this.moveControl = new MoveControl(this);
this.jumpControl = new JumpControl(this);
@@ -362,13 +364,10 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -363,13 +365,10 @@ public abstract class Mob extends LivingEntity implements Targeting {
@Override
public void baseTick() {
super.baseTick();
@@ -1334,7 +1334,7 @@ index fa0b78139fecc0245e168ebeb4172ea2531a3fec..2dfdeec25ef0d9a004601fd9b5050c88
}
@Override
@@ -673,7 +672,6 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -674,7 +673,6 @@ public abstract class Mob extends LivingEntity implements Targeting {
@Override
public void aiStep() {
super.aiStep();
@@ -1342,7 +1342,7 @@ index fa0b78139fecc0245e168ebeb4172ea2531a3fec..2dfdeec25ef0d9a004601fd9b5050c88
if (!this.level().isClientSide && this.canPickUpLoot() && this.isAlive() && !this.dead && this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
Vec3i baseblockposition = this.getPickupReach();
List<ItemEntity> list = this.level().getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate((double) baseblockposition.getX(), (double) baseblockposition.getY(), (double) baseblockposition.getZ()));
@@ -692,8 +690,6 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -693,8 +691,6 @@ public abstract class Mob extends LivingEntity implements Targeting {
}
}
}
@@ -1351,7 +1351,7 @@ index fa0b78139fecc0245e168ebeb4172ea2531a3fec..2dfdeec25ef0d9a004601fd9b5050c88
}
protected Vec3i getPickupReach() {
@@ -905,42 +901,22 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -906,42 +902,22 @@ public abstract class Mob extends LivingEntity implements Targeting {
return;
}
// Paper end - Allow nerfed mobs to jump and float
@@ -1568,10 +1568,10 @@ index 295769d039f2a1e4f48912a60f9dbe267d8992c1..81e69ea2858228942177e54c92b50b2b
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
index 4aeab90e778629c355189dfe79c39c4b21f5f5ac..0f3a11203dd0353d74626a273e9003131356f5e1 100644
index 958816ce2166248b542c96c10c398a52d769b4db..1ee12f16e7013521a288a3160dcc424c4e385204 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
@@ -79,12 +79,8 @@ public class Tadpole extends AbstractFish {
@@ -82,12 +82,8 @@ public class Tadpole extends AbstractFish {
@Override
protected void customServerAiStep() {
@@ -1703,10 +1703,10 @@ index 937f81a859953498abe73bea560c86e6560e1c33..b73bccfcb1b94936f500926a06a28a6a
if ((this.tickCount + this.getId()) % 120 == 0) {
Warden.applyDarknessAround(worldserver, this.position(), this, 20);
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 1aae466e3e334d7f4bbb3ea9365a255afcc3dd3a..1edc23e457432b571d00bce5a4c32c6d790368c2 100644
index 24044795d8e0f1fb15a4f2f5401f44897092f2a3..5fb3a32991b32132b0db56933671d2f999df667d 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -253,9 +253,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -254,9 +254,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
}
protected void customServerAiStep(final boolean inactive) {
// Paper end
@@ -1737,7 +1737,7 @@ index b678da2cbb93cea7971bc3c4d324cfca18b0bc97..bb8d73d4022b1e13bb3e2bcf74b511f6
if (this.fire) {
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index c7abd433e70a6479fc81e5bce94144c9479eb372..680cfc6e2e3acd0d5ce364c774772e3c4d072c31 100644
index 2161664f96bf130d6ca690be47dc7f3ff3a84cd0..21a350cab63e8bb3062ec38686fdc1b630f01857 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -130,7 +130,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1748,7 +1748,7 @@ index c7abd433e70a6479fc81e5bce94144c9479eb372..680cfc6e2e3acd0d5ce364c774772e3c
public final boolean isClientSide;
private final WorldBorder worldBorder;
private final BiomeManager biomeManager;
@@ -208,7 +207,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -217,7 +216,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public abstract ResourceKey<LevelStem> getTypeKey();
@@ -1757,7 +1757,7 @@ index c7abd433e70a6479fc81e5bce94144c9479eb372..680cfc6e2e3acd0d5ce364c774772e3c
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
this.galeConfig = galeWorldConfigCreator.apply(this.spigotConfig); // Gale - Gale configuration
@@ -223,7 +222,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -232,7 +231,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
// CraftBukkit end
@@ -1765,7 +1765,7 @@ index c7abd433e70a6479fc81e5bce94144c9479eb372..680cfc6e2e3acd0d5ce364c774772e3c
this.levelData = worlddatamutable;
this.dimensionTypeRegistration = holder;
this.dimensionTypeId = (ResourceKey) holder.unwrapKey().orElseThrow(() -> {
@@ -1259,9 +1257,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1268,9 +1266,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
protected void tickBlockEntities() {
@@ -1775,7 +1775,7 @@ index c7abd433e70a6479fc81e5bce94144c9479eb372..680cfc6e2e3acd0d5ce364c774772e3c
this.timings.tileEntityPending.startTiming(); // Spigot
this.tickingBlockEntities = true;
if (!this.pendingBlockEntityTickers.isEmpty()) {
@@ -1302,7 +1297,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1311,7 +1306,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
this.timings.tileEntityTick.stopTiming(); // Spigot
this.tickingBlockEntities = false;
co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
@@ -1783,7 +1783,7 @@ index c7abd433e70a6479fc81e5bce94144c9479eb372..680cfc6e2e3acd0d5ce364c774772e3c
this.spigotConfig.currentPrimedTnt = 0; // Spigot
}
@@ -1512,7 +1506,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1521,7 +1515,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@Override
public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
@@ -1791,7 +1791,7 @@ index c7abd433e70a6479fc81e5bce94144c9479eb372..680cfc6e2e3acd0d5ce364c774772e3c
List<Entity> list = Lists.newArrayList();
((ServerLevel)this).getEntityLookup().getEntities(except, box, list, predicate); // Paper - optimise this call
return list;
@@ -1531,7 +1524,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1540,7 +1533,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public <T extends Entity> void getEntities(EntityTypeTest<Entity, T> filter, AABB box, Predicate<? super T> predicate, List<? super T> result, int limit) {
@@ -1799,7 +1799,7 @@ index c7abd433e70a6479fc81e5bce94144c9479eb372..680cfc6e2e3acd0d5ce364c774772e3c
// Paper start - optimise this call
//TODO use limit
if (filter instanceof net.minecraft.world.entity.EntityType entityTypeTest) {
@@ -1790,11 +1782,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1799,11 +1791,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public ProfilerFiller getProfiler() {