Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-23 08:49:28 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Dreeam
2024-06-17 07:42:31 +08:00
parent e671167ace
commit c38aecb7c8
9 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=org.galemc.gale
version=1.21-R0.1-SNAPSHOT
mcVersion=1.21
paperRef=c84a3b541c8fda6fe57fae028bbb94d8fbd38cfd
paperRef=a7f66333625febf891e5126bbd432707d38d1b1c
updatingMinecraft=true

4
patches/server/0008-Gale-configuration.patch
View File

@@ -289,10 +289,10 @@ index 0761d5bc5f2813bb4a9f664ac7a05b9744d0a778..87ec971241047314e7d505fb6b35be4a
if (this.convertOldUsers()) {
this.getProfileCache().save(false); // Paper
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index fb0db51493e343c781876b9db773fa3fc9a8d666..1972203ee1bdd9966b74926bae6ef23d4a1cedef 100644
index b81ac6db8ba1ee0722e9e85f8de8ef91169a3198..ba1cecad79de47c29f42cb786647668bae189f22 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -503,7 +503,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -502,7 +502,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
// Holder holder = worlddimension.type(); // CraftBukkit - decompile error
// Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error

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

@@ -643,7 +643,7 @@ index df00ea382915480be1279a5347872cf7a1417341..a7142d9c7a1b739ada45f4d393fb970b
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 7dc2ecd8a80b063cec922021bd978ba2c6f8c0fb..4d12a8972007377b6541143e9a29b78b825cff68 100644
index 681fdab250d924a29ca160acffbcbf7f8a3ca78a..b5c302abb343a34f8f160454eacd8c98d007df70 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -22,7 +22,6 @@ import net.minecraft.network.protocol.Packet;
@@ -654,7 +654,7 @@ index 7dc2ecd8a80b063cec922021bd978ba2c6f8c0fb..4d12a8972007377b6541143e9a29b78b
import net.minecraft.util.thread.BlockableEventLoop;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.ai.village.poi.PoiManager;
@@ -435,19 +434,15 @@ public class ServerChunkCache extends ChunkSource {
@@ -453,19 +452,15 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
// CraftBukkit start - modelled on below
public void purgeUnload() {
@@ -674,7 +674,7 @@ index 7dc2ecd8a80b063cec922021bd978ba2c6f8c0fb..4d12a8972007377b6541143e9a29b78b
this.level.timings.doChunkMap.startTiming(); // Spigot
if (this.level.tickRateManager().runsNormally() || !tickChunks || this.level.spigotConfig.unloadFrozenChunks) { // Spigot
this.distanceManager.purgeStaleTickets();
@@ -455,7 +450,6 @@ public class ServerChunkCache extends ChunkSource {
@@ -473,7 +468,6 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
this.runDistanceManagerUpdates();
this.level.timings.doChunkMap.stopTiming(); // Spigot
@@ -682,7 +682,7 @@ index 7dc2ecd8a80b063cec922021bd978ba2c6f8c0fb..4d12a8972007377b6541143e9a29b78b
if (tickChunks) {
this.level.timings.chunks.startTiming(); // Paper - timings
((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel)this.level).moonrise$getPlayerChunkLoader().tick(); // Paper - rewrite chunk system
@@ -465,10 +459,8 @@ public class ServerChunkCache extends ChunkSource {
@@ -483,10 +477,8 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
}
this.level.timings.doChunkUnload.startTiming(); // Spigot
@@ -693,7 +693,7 @@ index 7dc2ecd8a80b063cec922021bd978ba2c6f8c0fb..4d12a8972007377b6541143e9a29b78b
this.clearCache();
}
@@ -478,10 +470,6 @@ public class ServerChunkCache extends ChunkSource {
@@ -496,10 +488,6 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
this.lastInhabitedUpdate = i;
if (!this.level.isDebug()) {
@@ -704,7 +704,7 @@ index 7dc2ecd8a80b063cec922021bd978ba2c6f8c0fb..4d12a8972007377b6541143e9a29b78b
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
@@ -496,7 +484,6 @@ public class ServerChunkCache extends ChunkSource {
@@ -514,7 +502,6 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
}
if (this.level.tickRateManager().runsNormally()) {
@@ -712,7 +712,7 @@ index 7dc2ecd8a80b063cec922021bd978ba2c6f8c0fb..4d12a8972007377b6541143e9a29b78b
this.level.timings.countNaturalMobs.startTiming(); // Paper - timings
int k = this.distanceManager.getNaturalSpawnChunkCount();
// Paper start - Optional per player mob spawns
@@ -525,7 +512,6 @@ public class ServerChunkCache extends ChunkSource {
@@ -543,7 +530,6 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
this.lastSpawnState = spawnercreature_d;
@@ -720,7 +720,7 @@ index 7dc2ecd8a80b063cec922021bd978ba2c6f8c0fb..4d12a8972007377b6541143e9a29b78b
boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
Util.shuffle(list, this.level.random);
@@ -560,7 +546,6 @@ public class ServerChunkCache extends ChunkSource {
@@ -578,7 +564,6 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
}
this.level.timings.chunkTicks.stopTiming(); // Paper
@@ -728,7 +728,7 @@ index 7dc2ecd8a80b063cec922021bd978ba2c6f8c0fb..4d12a8972007377b6541143e9a29b78b
if (flag) {
try (co.aikar.timings.Timing ignored = this.level.timings.miscMobSpawning.startTiming()) { // Paper - timings
this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies);
@@ -568,14 +553,11 @@ public class ServerChunkCache extends ChunkSource {
@@ -586,14 +571,11 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
}
}
@@ -743,7 +743,7 @@ index 7dc2ecd8a80b063cec922021bd978ba2c6f8c0fb..4d12a8972007377b6541143e9a29b78b
}
}
@@ -756,7 +738,6 @@ public class ServerChunkCache extends ChunkSource {
@@ -774,7 +756,6 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
@Override
protected void doRunTask(Runnable task) {
@@ -752,7 +752,7 @@ index 7dc2ecd8a80b063cec922021bd978ba2c6f8c0fb..4d12a8972007377b6541143e9a29b78b
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982c8aed905 100644
index ba1cecad79de47c29f42cb786647668bae189f22..5b29319f59f07c422f9df09af347e57d65c3fba0 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -80,7 +80,6 @@ import net.minecraft.util.ProgressListener;
@@ -763,7 +763,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
import net.minecraft.util.valueproviders.IntProvider;
import net.minecraft.util.valueproviders.UniformInt;
import net.minecraft.world.DifficultyInstance;
@@ -503,15 +502,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -502,15 +501,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
// Holder holder = worlddimension.type(); // CraftBukkit - decompile error
// Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
@@ -784,7 +784,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
this.pathTypesByPosCache = new PathTypeCache();
this.navigatingMobs = new ObjectOpenHashSet();
this.blockEvents = new ObjectLinkedOpenHashSet();
@@ -624,16 +625,12 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -623,16 +624,12 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
}
public void tick(BooleanSupplier shouldKeepTicking) {
@@ -801,7 +801,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
this.advanceWeatherCycle();
}
@@ -665,30 +662,23 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -664,30 +661,23 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
this.tickTime();
}
@@ -832,7 +832,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
if (flag) {
this.timings.doSounds.startTiming(); // Spigot
this.runBlockEvents();
@@ -696,7 +686,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -695,7 +685,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
}
this.handlingTick = false;
@@ -840,7 +840,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
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) {
@@ -704,12 +693,9 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -703,12 +692,9 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
}
if (flag1 || this.emptyTime++ < 300) {
@@ -853,7 +853,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
}
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
@@ -719,9 +705,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -718,9 +704,7 @@ 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)) {
@@ -863,7 +863,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
if (true || this.chunkSource.chunkMap.getDistanceManager().inEntityTickingRange(entity.chunkPosition().toLong())) { // Paper - rewrite chunk system
Entity entity1 = entity.getVehicle();
@@ -733,22 +717,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -732,22 +716,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
entity.stopRiding();
}
@@ -886,7 +886,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
}
@Override
@@ -803,9 +782,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -802,9 +781,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
boolean flag = this.isRaining();
int j = chunkcoordintpair.getMinBlockX();
int k = chunkcoordintpair.getMinBlockZ();
@@ -896,7 +896,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
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));
@@ -834,8 +811,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -833,8 +810,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
}
}
@@ -905,7 +905,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
if (!this.paperConfig().environment.disableIceAndSnow) { // Paper - Option to disable ice and snow
for (int l = 0; l < randomTickSpeed; ++l) {
if (this.random.nextInt(48) == 0) {
@@ -844,7 +819,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -843,7 +818,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
}
} // Paper - Option to disable ice and snow
@@ -913,7 +913,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
timings.chunkTicksBlocks.startTiming(); // Paper
if (randomTickSpeed > 0) {
LevelChunkSection[] achunksection = chunk.getSections();
@@ -859,7 +833,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -858,7 +832,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
for (int l1 = 0; l1 < randomTickSpeed; ++l1) {
BlockPos blockposition1 = this.getBlockRandomPos(j, k1, k, 15);
@@ -921,7 +921,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
BlockState iblockdata = chunksection.getBlockState(blockposition1.getX() - j, blockposition1.getY() - k1, blockposition1.getZ() - k);
if (iblockdata.isRandomlyTicking()) {
@@ -872,14 +845,12 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -871,14 +844,12 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
fluid.randomTick(this, blockposition1, this.random);
}
@@ -936,7 +936,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
}
@VisibleForTesting
@@ -1178,19 +1149,13 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -1177,19 +1148,13 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
try {
// Paper end - timings
entity.setOldPosAndRot();
@@ -956,7 +956,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
} finally { timer.stopTiming(); } // Paper - timings
Iterator iterator = entity.getPassengers().iterator();
@@ -1213,12 +1178,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -1212,12 +1177,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
// Paper end
passenger.setOldPosAndRot();
++passenger.tickCount;
@@ -969,7 +969,7 @@ index 1972203ee1bdd9966b74926bae6ef23d4a1cedef..e018f5686406b58e09c9b62a9bcd4982
// Paper start - EAR 2
if (isActive) {
passenger.rideTick();
@@ -1230,7 +1190,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -1229,7 +1189,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
vehicle.positionRider(passenger);
}
// Paper end - EAR 2
@@ -1128,7 +1128,7 @@ index 298e3eddd600f0b2e48ce2d4080cf68adff59a3a..6b3c57fc1231cd37e17a58137bb78411
protected abstract T prepare(ResourceManager manager, ProfilerFiller profiler);
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 898651b7cfff15fe1afb690c247cdc3936d12fa6..43740e99f0408c43d3342d63a096e22bfbafb240 100644
index 437956b18d5bffd93c46e0be34cf413e9c704e5a..ae2dac2ba1732164b4e1f41c5b60f42a1b13de3e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -837,7 +837,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

8
patches/server/0037-Reduce-entity-fluid-lookups-if-no-fluids.patch
View File

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index d676561e1646f673b710abab38f565aadbc0ab28..7b4649b774a9e9cf248225494d386761a8edd2c8 100644
index 07a3f5bc00fdb932831b579f4a189eddefe328f8..6fd31b9566d6583ed30a73a6a36bf19b7fa64a60 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4286,16 +4286,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4275,16 +4275,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -60,7 +60,7 @@ index d676561e1646f673b710abab38f565aadbc0ab28..7b4649b774a9e9cf248225494d386761
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4303,14 +4305,61 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4292,14 +4294,61 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@@ -128,7 +128,7 @@ index d676561e1646f673b710abab38f565aadbc0ab28..7b4649b774a9e9cf248225494d386761
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -4332,9 +4381,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4321,9 +4370,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// CraftBukkit end
}
}

4
patches/server/0086-Skip-entity-move-if-movement-is-zero.patch
View File

@@ -13,7 +13,7 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index ba0e7bc1dd98ea632ab80091acb900b862186dad..329856d3656da0fd01ab1500a423cae554d2544a 100644
index 215a193baf6a54b307c94c9ffa912430db6a2cf5..95e06a768d264701e5522d389a8c8fa20c68fa63 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -323,6 +323,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -36,7 +36,7 @@ index ba0e7bc1dd98ea632ab80091acb900b862186dad..329856d3656da0fd01ab1500a423cae5
final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
if (this.noPhysics) {
this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
@@ -3985,6 +3991,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3974,6 +3980,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public final void setBoundingBox(AABB boundingBox) {

6
patches/server/0093-Reduce-block-destruction-packet-allocations.patch
View File

@@ -13,10 +13,10 @@ As part of: SportPaper (https://github.com/Electroid/SportPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index e018f5686406b58e09c9b62a9bcd4982c8aed905..29a8a8ff340eb1d14e691257e523c8624c760613 100644
index 5b29319f59f07c422f9df09af347e57d65c3fba0..bab835c5254d857061920a02bc7c918eb9da7436 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1468,7 +1468,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -1467,7 +1467,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@Override
public void destroyBlockProgress(int entityId, BlockPos pos, int progress) {
@@ -35,7 +35,7 @@ index e018f5686406b58e09c9b62a9bcd4982c8aed905..29a8a8ff340eb1d14e691257e523c862
// CraftBukkit start
Player entityhuman = null;
@@ -1502,7 +1512,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -1501,7 +1511,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
// CraftBukkit end
if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {

4
patches/server/0099-Load-portal-destination-chunk-before-entity-teleport.patch
View File

@@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 32c6c4f8bdc2510a9fbce18be4cf64cbe21e6f10..e61d03c775d05fe33ce7f2ca7c83ac4d7b55c8cf 100644
index a315310adcb46dd9daa7dfbeefb766099ad50d74..1c28613061146757f07f84f7df37e4cdf3583f4e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3860,7 +3860,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3849,7 +3849,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
if (entity == null) {
return false;

4
patches/server/0101-Don-t-load-chunks-to-activate-climbing-entities.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index e61d03c775d05fe33ce7f2ca7c83ac4d7b55c8cf..36190c0b1417c943e9763db96d3a7c72f02dd149 100644
index 1c28613061146757f07f84f7df37e4cdf3583f4e..2f11a6e09fa42470d2b4c995b5282bb306a3ba87 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4508,6 +4508,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4497,6 +4497,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return this.inBlockState;
}

10
patches/server/0104-Skip-unnecessary-mob-spawning-computations.patch
View File

@@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 4d12a8972007377b6541143e9a29b78b825cff68..510b29649346375b2dfea606ac722ea2c063a91a 100644
index b5c302abb343a34f8f160454eacd8c98d007df70..d619e2230ec6334eaf86e55cb4bf630961369e13 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -484,11 +484,16 @@ public class ServerChunkCache extends ChunkSource {
@@ -502,11 +502,16 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
}
if (this.level.tickRateManager().runsNormally()) {
@@ -34,7 +34,7 @@ index 4d12a8972007377b6541143e9a29b78b825cff68..510b29649346375b2dfea606ac722ea2
if ((this.spawnFriendlies || this.spawnEnemies) && this.level.paperConfig().entities.spawning.perPlayerMobSpawns) { // don't count mobs when animals and monsters are disabled
// re-set mob counts
for (ServerPlayer player : this.level.players) {
@@ -512,7 +517,11 @@ public class ServerChunkCache extends ChunkSource {
@@ -530,7 +535,11 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
this.lastSpawnState = spawnercreature_d;
@@ -47,7 +47,7 @@ index 4d12a8972007377b6541143e9a29b78b825cff68..510b29649346375b2dfea606ac722ea2
Util.shuffle(list, this.level.random);
// Paper start - PlayerNaturallySpawnCreaturesEvent
@@ -535,7 +544,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -553,7 +562,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
if (this.level.isNaturalSpawningAllowed(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(chunkcoordintpair)) {
chunk1.incrementInhabitedTime(j);
@@ -56,7 +56,7 @@ index 4d12a8972007377b6541143e9a29b78b825cff68..510b29649346375b2dfea606ac722ea2
NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
}
@@ -561,6 +570,20 @@ public class ServerChunkCache extends ChunkSource {
@@ -579,6 +588,20 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
}
}