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

Fix compilation issues (#1530)

Browse Source
This commit is contained in:
Krakenied
2024-06-17 01:52:10 +02:00
committed by GitHub
parent 6e1147f1ac
commit c9917352de
306 changed files with 1065 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
patches/server/0249-Remove-Mojang-Profiler.patch
View File

@@ -468,10 +468,10 @@ index b27cb90a52bc7d96d4318979c678a49a884562b2..686f3d8c91e1ffc0c7ffe1cd9bcf5df5
public boolean hasWork() {
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 8bead89ad6f54f5dbc6b03d90b6bb111fd2c983b..9bdcc6ee612c4e684482f3ff49d1eafd6690bbe0 100644
index fbb1753425a1cd456e4096b9fe506264e3dac505..adf79eb40c62e56311533de6c919f77e81ab4284 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -435,26 +435,26 @@ public class ServerChunkCache extends ChunkSource {
@@ -453,26 +453,26 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
// CraftBukkit start - modelled on below
public void purgeUnload() {
@@ -503,7 +503,7 @@ index 8bead89ad6f54f5dbc6b03d90b6bb111fd2c983b..9bdcc6ee612c4e684482f3ff49d1eafd
if (tickChunks) {
//this.level.timings.chunks.startTiming(); // Paper - timings // Purpur
((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel)this.level).moonrise$getPlayerChunkLoader().tick(); // Paper - rewrite chunk system
@@ -464,10 +464,10 @@ public class ServerChunkCache extends ChunkSource {
@@ -482,10 +482,10 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
}
//this.level.timings.doChunkUnload.startTiming(); // Spigot // Purpur
@@ -516,7 +516,7 @@ index 8bead89ad6f54f5dbc6b03d90b6bb111fd2c983b..9bdcc6ee612c4e684482f3ff49d1eafd
this.clearCache();
}
@@ -477,10 +477,10 @@ public class ServerChunkCache extends ChunkSource {
@@ -495,10 +495,10 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
this.lastInhabitedUpdate = i;
if (!this.level.isDebug()) {
@@ -530,7 +530,7 @@ index 8bead89ad6f54f5dbc6b03d90b6bb111fd2c983b..9bdcc6ee612c4e684482f3ff49d1eafd
List<ServerChunkCache.ChunkAndHolder> list = Lists.newArrayListWithCapacity(this.chunkMap.size());
Iterator iterator = this.chunkMap.getChunks().iterator();
//if (this.level.getServer().tickRateManager().runsNormally()) this.level.timings.chunkTicks.startTiming(); // Paper // Purpur
@@ -495,7 +495,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -513,7 +513,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
}
if (this.level.tickRateManager().runsNormally()) {
@@ -539,7 +539,7 @@ index 8bead89ad6f54f5dbc6b03d90b6bb111fd2c983b..9bdcc6ee612c4e684482f3ff49d1eafd
//this.level.timings.countNaturalMobs.startTiming(); // Paper - timings // Purpur
int k = this.distanceManager.getNaturalSpawnChunkCount();
// Paper start - Optional per player mob spawns
@@ -524,7 +524,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -542,7 +542,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
// this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings // Purpur
this.lastSpawnState = spawnercreature_d;
@@ -548,7 +548,7 @@ index 8bead89ad6f54f5dbc6b03d90b6bb111fd2c983b..9bdcc6ee612c4e684482f3ff49d1eafd
boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
Util.shuffle(list, this.level.random);
@@ -559,7 +559,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -577,7 +577,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
}
//this.level.timings.chunkTicks.stopTiming(); // Paper // Purpur
@@ -557,7 +557,7 @@ index 8bead89ad6f54f5dbc6b03d90b6bb111fd2c983b..9bdcc6ee612c4e684482f3ff49d1eafd
if (flag) {
//try (co.aikar.timings.Timing ignored = this.level.timings.miscMobSpawning.startTiming()) { // Paper - timings // Purpur
this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies);
@@ -567,14 +567,14 @@ public class ServerChunkCache extends ChunkSource {
@@ -585,14 +585,14 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
}
}
@@ -575,7 +575,7 @@ index 8bead89ad6f54f5dbc6b03d90b6bb111fd2c983b..9bdcc6ee612c4e684482f3ff49d1eafd
}
}
@@ -755,7 +755,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -773,7 +773,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
@Override
protected void doRunTask(Runnable task) {
@@ -585,10 +585,10 @@ index 8bead89ad6f54f5dbc6b03d90b6bb111fd2c983b..9bdcc6ee612c4e684482f3ff49d1eafd
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41edbc39ca77 100644
index 55446501a3bc42e4881eb38b13d1de5d03d22c0d..500a735113f9f16f9d336c2bb1cad1447e5d64c4 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -645,16 +645,16 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -644,16 +644,16 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
}
public void tick(BooleanSupplier shouldKeepTicking) {
@@ -608,7 +608,7 @@ index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41ed
this.advanceWeatherCycle();
}
@@ -686,30 +686,30 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -685,30 +685,30 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
this.tickTime();
}
@@ -646,7 +646,7 @@ index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41ed
if (flag) {
// this.timings.doSounds.startTiming(); // Spigot // Purpur
this.runBlockEvents();
@@ -717,7 +717,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -716,7 +716,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
}
this.handlingTick = false;
@@ -655,7 +655,7 @@ index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41ed
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) {
@@ -725,12 +725,12 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -724,12 +724,12 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
}
if (flag1 || this.emptyTime++ < 300) {
@@ -671,7 +671,7 @@ index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41ed
}
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
@@ -740,9 +740,9 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -739,9 +739,9 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
entity.discard();
} else if (!tickratemanager.isEntityFrozen(entity)) {
@@ -683,7 +683,7 @@ index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41ed
if (true || this.chunkSource.chunkMap.getDistanceManager().inEntityTickingRange(entity.chunkPosition().toLong())) { // Paper - rewrite chunk system
Entity entity1 = entity.getVehicle();
@@ -754,22 +754,22 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -753,22 +753,22 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
entity.stopRiding();
}
@@ -711,7 +711,7 @@ index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41ed
}
@Override
@@ -845,9 +845,9 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -844,9 +844,9 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
boolean flag = this.isRaining();
int j = chunkcoordintpair.getMinBlockX();
int k = chunkcoordintpair.getMinBlockZ();
@@ -723,7 +723,7 @@ index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41ed
if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - Option to disable thunder
BlockPos blockposition = this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15));
@@ -884,7 +884,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -883,7 +883,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
}
}
@@ -732,7 +732,7 @@ index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41ed
if (!this.paperConfig().environment.disableIceAndSnow) { // Paper - Option to disable ice and snow
for (int l = 0; l < randomTickSpeed; ++l) {
@@ -894,7 +894,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -893,7 +893,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
}
} // Paper - Option to disable ice and snow
@@ -741,7 +741,7 @@ index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41ed
//timings.chunkTicksBlocks.startTiming(); // Paper // Purpur
if (randomTickSpeed > 0) {
LevelChunkSection[] achunksection = chunk.getSections();
@@ -909,7 +909,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -908,7 +908,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
for (int l1 = 0; l1 < randomTickSpeed; ++l1) {
BlockPos blockposition1 = this.getBlockRandomPos(j, k1, k, 15);
@@ -750,7 +750,7 @@ index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41ed
BlockState iblockdata = chunksection.getBlockState(blockposition1.getX() - j, blockposition1.getY() - k1, blockposition1.getZ() - k);
if (iblockdata.isRandomlyTicking()) {
@@ -922,14 +922,14 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -921,14 +921,14 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
fluid.randomTick(this, blockposition1, this.random);
}
@@ -767,7 +767,7 @@ index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41ed
}
@VisibleForTesting
@@ -1246,19 +1246,19 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -1245,19 +1245,19 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
//try { // Purpur
// Paper end - timings
entity.setOldPosAndRot();
@@ -792,7 +792,7 @@ index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41ed
//} finally { timer.stopTiming(); } // Paper - timings // Purpur
Iterator iterator = entity.getPassengers().iterator();
@@ -1281,12 +1281,12 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -1280,12 +1280,12 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
// Paper end
passenger.setOldPosAndRot();
++passenger.tickCount;
@@ -809,7 +809,7 @@ index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41ed
// Paper start - EAR 2
if (isActive) {
passenger.rideTick();
@@ -1298,7 +1298,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -1297,7 +1297,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
vehicle.positionRider(passenger);
}
// Paper end - EAR 2
@@ -819,7 +819,7 @@ index e78d3a8e286a0f62b0211dec91cac1ca64f73e52..b37c54afb68c4c78cc86703b7cdb41ed
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index fceb216d553763db971115ed4c30535bf52e80f6..f7d1310b3c3b35d835e7a292b1356b46b1b72024 100644
index a7dced47c7946152740e906882d79b5910c5d9d5..b95044ac3db41f3c4f9404b139ec58eb59d8139e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1398,7 +1398,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -1078,10 +1078,10 @@ index a715ecf4a8ac91d3e5e5c6269d89e54b2c1cd279..223c3665126c576eddb1a8f7c9f5bc60
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index fccf206ed36c26665aad8831fe284a973d56cdce..59d75a40b2d6dd3ce8bdcf2b5e5553471ed76f9e 100644
index 496551820d0357da9c5e89dd989d31b43fbfeb18..99c01f0328fab0a71a888dd57c74e9771e9e6bb8 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -827,7 +827,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -859,7 +859,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// CraftBukkit end
public void baseTick() {
@@ -1090,7 +1090,7 @@ index fccf206ed36c26665aad8831fe284a973d56cdce..59d75a40b2d6dd3ce8bdcf2b5e555347
if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Prevent entity loading causing async lookups
this.inBlockState = null;
if (this.isPassenger() && this.getVehicle().isRemoved()) {
@@ -892,7 +892,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -924,7 +924,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
Leashable.tickLeash((Entity & Leashable) this); // CraftBukkit - decompile error
}
@@ -1099,7 +1099,7 @@ index fccf206ed36c26665aad8831fe284a973d56cdce..59d75a40b2d6dd3ce8bdcf2b5e555347
}
public void setSharedFlagOnFire(boolean onFire) {
@@ -1070,7 +1070,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1102,7 +1102,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
}
@@ -1108,7 +1108,7 @@ index fccf206ed36c26665aad8831fe284a973d56cdce..59d75a40b2d6dd3ce8bdcf2b5e555347
if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
movement = movement.multiply(this.stuckSpeedMultiplier);
this.stuckSpeedMultiplier = Vec3.ZERO;
@@ -1079,7 +1079,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1111,7 +1111,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// Paper start - ignore movement changes while inactive.
if (isTemporarilyActive && !(this instanceof ItemEntity) && movement == getDeltaMovement() && movementType == MoverType.SELF) {
setDeltaMovement(Vec3.ZERO);
@@ -1117,7 +1117,7 @@ index fccf206ed36c26665aad8831fe284a973d56cdce..59d75a40b2d6dd3ce8bdcf2b5e555347
return;
}
// Paper end
@@ -1100,8 +1100,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1132,8 +1132,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z);
}
@@ -1128,7 +1128,7 @@ index fccf206ed36c26665aad8831fe284a973d56cdce..59d75a40b2d6dd3ce8bdcf2b5e555347
boolean flag = !Mth.equal(movement.x, vec3d1.x);
boolean flag1 = !Mth.equal(movement.z, vec3d1.z);
@@ -1120,7 +1120,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1152,7 +1152,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.checkFallDamage(vec3d1.y, this.onGround(), iblockdata, blockposition);
if (this.isRemoved()) {
@@ -1137,7 +1137,7 @@ index fccf206ed36c26665aad8831fe284a973d56cdce..59d75a40b2d6dd3ce8bdcf2b5e555347
} else {
if (this.horizontalCollision) {
Vec3 vec3d2 = this.getDeltaMovement();
@@ -1223,7 +1223,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1255,7 +1255,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.setRemainingFireTicks(-this.getFireImmuneTicks());
}
@@ -1146,16 +1146,16 @@ index fccf206ed36c26665aad8831fe284a973d56cdce..59d75a40b2d6dd3ce8bdcf2b5e555347
}
}
}
@@ -3111,7 +3111,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3143,7 +3143,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.processPortalCooldown();
if (this.portalProcess != null) {
if (this.portalProcess.processPortalTeleportation(worldserver, this, this.canUsePortal(false))) {
- worldserver.getProfiler().push("portal");
+ //worldserver.getProfiler().push("portal"); // Purpur
// Paper start - Add EntityPortalReadyEvent
ServerLevel changedTarget = worldserver.getServer().getLevel(worldserver.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.NETHER ? Level.OVERWORLD : Level.NETHER);
if (this.portalProcess.isSamePortal(((net.minecraft.world.level.block.NetherPortalBlock) net.minecraft.world.level.block.Blocks.NETHER_PORTAL))) {
@@ -3134,7 +3134,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.setPortalCooldown();
DimensionTransition dimensiontransition = this.portalProcess.getPortalDestination(worldserver, this);
@@ -3155,7 +3155,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
}
@@ -1164,7 +1164,7 @@ index fccf206ed36c26665aad8831fe284a973d56cdce..59d75a40b2d6dd3ce8bdcf2b5e555347
} else if (this.portalProcess.hasExpired()) {
this.portalProcess = null;
}
@@ -3635,7 +3635,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3656,7 +3656,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
}
@@ -1173,7 +1173,7 @@ index fccf206ed36c26665aad8831fe284a973d56cdce..59d75a40b2d6dd3ce8bdcf2b5e555347
Entity entity2 = worldserver1.dimension() == worldserver.dimension() ? this : this.getType().create(worldserver1);
if (entity2 != null) {
@@ -3671,7 +3671,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3692,7 +3692,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
teleportTarget.postDimensionTransition().onTransition(entity2);
}
@@ -1183,7 +1183,7 @@ index fccf206ed36c26665aad8831fe284a973d56cdce..59d75a40b2d6dd3ce8bdcf2b5e555347
}
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 0c89b32f868bfdeb995c9652f15de7b1816e7bfe..3f0d3229ec4727c0d176a2e603c3f9e933f3395e 100644
index a9833d805aa51755a15fd98ca546c119e7e4bdf9..c8c931135133ef3d1d491034d578d9af47d9a9bd 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -445,7 +445,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1294,7 +1294,7 @@ index 0c89b32f868bfdeb995c9652f15de7b1816e7bfe..3f0d3229ec4727c0d176a2e603c3f9e9
// Purpur start
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 84827f266bddd75ee91e7e88e49caf6d66c58d2b..1612da157bc59799ab98eba673049c046cffa38f 100644
index 6dfb13eef96ff43d368cd8163ae5883571cec604..a07cadcbd73f7058a5cf8535fb317ac0e493eeeb 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -370,13 +370,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1806,9 +1806,27 @@ index bff83fe413c7baef4ba56a3270ea4463a58c792f..3ee7bf7e10f8120258baaae8f77cdcbb
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 e94e6cc538094de4ce0fc0f615e6fed8bcdcb828..c6760eb6ad0b4cedd5a2b22e9c460a76d10cb5b6 100644
index e94e6cc538094de4ce0fc0f615e6fed8bcdcb828..629f35eda2f31b17025fd9d0e594cdebabc0a504 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -268,7 +268,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@Override
public final <T extends Entity> List<T> getEntitiesOfClass(final Class<T> entityClass, final AABB boundingBox, final Predicate<? super T> predicate) {
- this.getProfiler().incrementCounter("getEntities");
+ //this.getProfiler().incrementCounter("getEntities"); // Purpur
final List<T> ret = new java.util.ArrayList<>();
((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevel)this).moonrise$getEntityLookup().getEntities(entityClass, null, boundingBox, ret, predicate);
@@ -278,7 +278,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@Override
public final List<Entity> moonrise$getHardCollidingEntities(final Entity entity, final AABB box, final Predicate<? super Entity> predicate) {
- this.getProfiler().incrementCounter("getEntities");
+ //this.getProfiler().incrementCounter("getEntities"); // Purpur
final List<Entity> ret = new java.util.ArrayList<>();
((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevel)this).moonrise$getEntityLookup().getHardCollidingEntities(entity, box, ret, predicate);
@@ -984,9 +984,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
}