Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-21 15:59:23 +00:00
Code Issues Releases Activity

move small patches back to sources

Browse Source
This commit is contained in:
NONPLAYT
2025-07-17 18:24:36 +03:00
parent cd8ddb5dc6
commit 939c2389d5
111 changed files with 217 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
divinemc-server/minecraft-patches/features/0001-Rebrand.patch
View File

@@ -86,10 +86,10 @@ index b06c2c4aa77edafb374f7cf0406cf4d29c6e7f9f..a058ef4d74da29372a894c8a4d619b2d
String awtException = io.papermc.paper.util.ServerEnvironment.awtDependencyCheck();
if (awtException != null) {
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
index 1c064e1d2edcda5d0b10fb3cc3417937ac0b3835..3b6d2cf670caefd42536de896d3e13c96ebf87b1 100644
index d651ddade8a460c25f4f8d70822d9ef69f1acb4b..8fce263f8cab4e0ff2ee6fe4fd9e46bbd0bbde19 100644
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -1176,6 +1176,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1177,6 +1177,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
protected void runServer() {
try {

4
divinemc-server/minecraft-patches/features/0002-Configuration.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configuration
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
index 670553243d26e2faab8a21f099a846d4d1df7927..83bd88eb9944481642f912c2d4862dfecdec2246 100644
index 512eeef7a770fa8264acbe4194a0debb23f8c3c1..80d04f4eb5122d571409a50f5921c3403dacf31f 100644
--- a/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
@@ -162,6 +162,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -24,7 +24,7 @@ index 670553243d26e2faab8a21f099a846d4d1df7927..83bd88eb9944481642f912c2d4862dfe
+ org.bxteam.divinemc.command.DivineCommands.registerCommands(this); // DivineMC - Configuration
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
this.setPvpAllowed(properties.pvp);
// DivineMC start - Pufferfish SIMD
diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
index dccfd0f30111316c9c82004358c2a7051cbd5cdb..1ad419b4a2ad4610a0a8d18b26665a7ec0ccc960 100644
--- a/net/minecraft/world/level/Level.java

76
divinemc-server/minecraft-patches/features/0003-Completely-remove-Mojang-profiler.patch
View File

@@ -213,7 +213,7 @@ index 18071dcc69cc28471dddb7de94e803ec1e5fc2e4..aa25f5ebaf7d1b22825b962b02dcae02
}
}
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9243fd4a8 100644
index 8fce263f8cab4e0ff2ee6fe4fd9e46bbd0bbde19..6498455c4c2838cbee743f016d8be1fe2fb61f6d 100644
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -114,19 +114,8 @@ import net.minecraft.util.TimeUtil;
@@ -260,7 +260,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9
LOGGER.info("Stopping server");
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
@@ -1267,50 +1246,38 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1268,50 +1247,38 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Spigot end
boolean flag = l == 0L;
@@ -336,7 +336,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9
this.isReady = true;
JvmProfiler.INSTANCE.onServerTick(this.smoothedTickTimeMillis);
}
@@ -1482,7 +1449,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1483,7 +1450,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@Override
public void doRunTask(TickTask task) {
@@ -344,7 +344,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9
super.doRunTask(task);
}
@@ -1572,12 +1538,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1573,12 +1539,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.ticksUntilAutosave--;
// Paper start - Incremental chunk and player saving
@@ -357,7 +357,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9
final boolean fullSave = autosavePeriod > 0 && this.tickCount % autosavePeriod == 0;
try {
this.isSaving = true;
@@ -1592,10 +1556,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1593,10 +1557,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
} finally {
this.isSaving = false;
}
@@ -368,7 +368,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9
this.runAllTasks(); // Paper - move runAllTasks() into full server tick (previously for timings)
this.server.spark.executeMainThreadTasks(); // Paper - spark
// Paper start - Server Tick Events
@@ -1604,7 +1566,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1605,7 +1567,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.tickCount, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
// Paper end - Server Tick Events
this.server.spark.tickEnd(((double)(endTime - lastTick) / 1000000D)); // Paper - spark
@@ -376,7 +376,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9
long l = Util.getNanos() - nanos;
int i1 = this.tickCount % 100;
this.aggregatedTickTimesNanos = this.aggregatedTickTimesNanos - this.tickTimesNanos[i1];
@@ -1617,16 +1578,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1618,16 +1579,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.tickTimes60s.add(this.tickCount, l);
// Paper end - Add tick times API and /mspt command
this.logTickMethodTime(nanos);
@@ -393,7 +393,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9
LOGGER.debug("Autosave finished");
}
@@ -1694,7 +1651,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1695,7 +1652,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public final io.papermc.paper.threadedregions.EntityScheduler.EntitySchedulerTickList entitySchedulerTickList = new io.papermc.paper.threadedregions.EntityScheduler.EntitySchedulerTickList(); // Paper - optimise Folia entity scheduler
protected void tickChildren(BooleanSupplier hasTimeLeft) {
@@ -401,7 +401,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9
this.getPlayerList().getPlayers().forEach(serverPlayer1 -> serverPlayer1.connection.suspendFlushing());
this.server.getScheduler().mainThreadHeartbeat(); // CraftBukkit
// Paper start - optimise Folia entity scheduler
@@ -1709,9 +1665,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1710,9 +1666,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Paper end - optimise Folia entity scheduler
io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.ADVENTURE_CLICK_MANAGER.handleQueue(this.tickCount); // Paper
io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.DIALOG_CLICK_MANAGER.handleQueue(this.tickCount); // Paper
@@ -411,7 +411,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9
// CraftBukkit start
// Run tasks that are waiting on processing
@@ -1747,17 +1701,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1748,17 +1702,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
serverLevel.updateLagCompensationTick(); // Paper - lag compensation
net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = serverLevel.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
serverLevel.hasRidableMoveEvent = org.purpurmc.purpur.event.entity.RidableMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Purpur - Ridables
@@ -429,7 +429,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9
try {
serverLevel.tick(hasTimeLeft);
} catch (Throwable var7) {
@@ -1766,34 +1715,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1767,34 +1716,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
throw new ReportedException(crashReport);
}
@@ -464,7 +464,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9
}
public void tickConnection() {
@@ -1809,14 +1748,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1810,14 +1749,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void forceTimeSynchronization() {
@@ -479,7 +479,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9
}
public boolean isLevelEnabled(Level level) {
@@ -2632,55 +2566,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2633,55 +2567,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
// CraftBukkit end
@@ -535,7 +535,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9
public Path getWorldPath(LevelResource levelResource) {
return this.storageSource.getLevelPath(levelResource);
}
@@ -2730,24 +2615,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2731,24 +2616,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
return this.isSaving;
}
@@ -560,7 +560,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9
public int getMaxChainedNeighborUpdates() {
return 1000000;
}
@@ -2857,55 +2724,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2858,55 +2725,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public record ServerResourcePackInfo(UUID id, String url, String hash, boolean isRequired, @Nullable Component prompt) {
}
@@ -1067,10 +1067,10 @@ index b10cb4a73df58a5fe64e88868733ba41616f59e4..9f9cbe6056f8a4eeca64c40872d7403b
+ // DivineMC end - Completely remove Mojang profiler
}
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
index 83bd88eb9944481642f912c2d4862dfecdec2246..06657a0fbf65dd095519d706dd5a8e1d8b6b381a 100644
index 80d04f4eb5122d571409a50f5921c3403dacf31f..ac35fc08574a72be356c48fb6e1cfafe36cd0860 100644
--- a/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
@@ -789,12 +789,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -809,12 +809,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
return this.settings.getProperties().serverResourcePackInfo;
}
@@ -1479,7 +1479,7 @@ index 3c7159d0981c948e71a5612ba4083accb5849ed4..5f2c27800f047f128857044493a6d932
for (Entity entity : passengerEntity.getPassengers()) {
this.tickPassenger(passengerEntity, entity, isActive); // Paper - EAR 2
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index f17f54c93d3a10dbae9e2316849667e647904777..6362a448b19af256b8e5f6c2ffecb1687f1bc3e2 100644
index c75e9e5b7392351ed7311e8d9aa3c49cdb812663..b4bbacdd5061f45c619211bbed40a5f9dc1b0ae0 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -106,8 +106,6 @@ import net.minecraft.util.HashOps;
@@ -4006,7 +4006,7 @@ index 39a604c9a53930b53d959b1d2eb504aa964e9a58..0d0380e3955836ce125f777841477503
@Override
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894dc49d303 100644
index 310d5aabf282ef62432b496065447f055b45af18..0171befef713e89d9241c7735d5d285b23373e8f 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -80,8 +80,6 @@ import net.minecraft.tags.TagKey;
@@ -4018,7 +4018,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.Nameable;
@@ -873,8 +871,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -874,8 +872,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// CraftBukkit end
public void baseTick() {
@@ -4027,7 +4027,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894
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()) {
@@ -928,8 +924,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -929,8 +925,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
if (this.level() instanceof ServerLevel serverLevelx && this instanceof Leashable) {
Leashable.tickLeash(serverLevelx, (Entity & Leashable)this);
}
@@ -4036,7 +4036,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894
}
public void setSharedFlagOnFire(boolean isOnFire) {
@@ -1150,8 +1144,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1152,8 +1146,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
}
@@ -4045,7 +4045,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894
if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7) {
movement = movement.multiply(this.stuckSpeedMultiplier);
this.stuckSpeedMultiplier = Vec3.ZERO;
@@ -1160,7 +1152,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1162,7 +1154,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// Paper start - ignore movement changes while inactive.
if (isTemporarilyActive && !(this instanceof ItemEntity) && movement == getDeltaMovement() && type == MoverType.SELF) {
setDeltaMovement(Vec3.ZERO);
@@ -4053,7 +4053,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894
return;
}
// Paper end
@@ -1185,8 +1176,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1187,8 +1178,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.setPos(vec32);
}
@@ -4062,7 +4062,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894
boolean flag = !Mth.equal(movement.x, vec3.x);
boolean flag1 = !Mth.equal(movement.z, vec3.z);
this.horizontalCollision = flag || flag1;
@@ -1209,7 +1198,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1211,7 +1200,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
if (this.isRemoved()) {
@@ -4071,7 +4071,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894
} else {
if (this.horizontalCollision) {
Vec3 deltaMovement = this.getDeltaMovement();
@@ -1253,7 +1242,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1255,7 +1244,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
float blockSpeedFactor = this.getBlockSpeedFactor();
this.setDeltaMovement(this.getDeltaMovement().multiply(blockSpeedFactor, 1.0, blockSpeedFactor));
@@ -4079,7 +4079,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894
}
}
// Paper start - detailed watchdog information
@@ -3466,8 +3454,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3468,8 +3456,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.processPortalCooldown();
if (this.portalProcess != null) {
if (this.portalProcess.processPortalTeleportation(serverLevel, this, this.canUsePortal(false))) {
@@ -4088,7 +4088,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894
this.setPortalCooldown();
TeleportTransition portalDestination = this.portalProcess.getPortalDestination(serverLevel, this);
if (portalDestination != null) {
@@ -3477,8 +3463,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3479,8 +3465,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.teleport(portalDestination);
}
}
@@ -4097,7 +4097,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894
} else if (this.portalProcess.hasExpired()) {
this.portalProcess = null;
}
@@ -4045,15 +4029,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4047,15 +4031,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
entity.teleport(this.calculatePassengerTransition(teleportTransition, entity));
}
@@ -4113,7 +4113,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894
return this;
}
@@ -4069,11 +4050,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4071,11 +4052,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
}
@@ -4125,7 +4125,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894
return null;
} else {
// Paper start - Fix item duplication and teleport issues
@@ -4093,7 +4071,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4095,7 +4073,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
newLevel.resetEmptyTime();
teleportTransition.postTeleportTransition().onTransition(entityx);
this.teleportSpectators(teleportTransition, oldLevel);
@@ -4134,7 +4134,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894
}
}
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index ddd3acbc804cbc07eaccf578349d3f9e0e00b6fc..0c0144679c9d44d50af153c792d7e5da175365d8 100644
index 590ccc9d181d401abd1154ae1f16b1230e8195f1..8df6ceea1536b12d87755c8a69e1b652d280600c 100644
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -69,8 +69,6 @@ import net.minecraft.tags.FluidTags;
@@ -4163,7 +4163,7 @@ index ddd3acbc804cbc07eaccf578349d3f9e0e00b6fc..0c0144679c9d44d50af153c792d7e5da
}
@Override
@@ -3364,11 +3359,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -3371,11 +3366,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
f1 = this.getYRot();
}
@@ -4175,7 +4175,7 @@ index ddd3acbc804cbc07eaccf578349d3f9e0e00b6fc..0c0144679c9d44d50af153c792d7e5da
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3380,7 +3371,6 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -3387,7 +3378,6 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end - stop large pitch and yaw changes from crashing the server
@@ -4183,7 +4183,7 @@ index ddd3acbc804cbc07eaccf578349d3f9e0e00b6fc..0c0144679c9d44d50af153c792d7e5da
if (this.isFallFlying()) {
this.fallFlyTicks++;
} else {
@@ -3556,21 +3546,15 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -3563,21 +3553,15 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
}
this.setDeltaMovement(d, d1, d2);
@@ -4205,7 +4205,7 @@ index ddd3acbc804cbc07eaccf578349d3f9e0e00b6fc..0c0144679c9d44d50af153c792d7e5da
if (this.jumping && this.isAffectedByFluids()) {
double fluidHeight;
if (this.isInLava()) {
@@ -3599,8 +3583,6 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -3606,8 +3590,6 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
this.noJumpDelay = 0;
}
@@ -4214,7 +4214,7 @@ index ddd3acbc804cbc07eaccf578349d3f9e0e00b6fc..0c0144679c9d44d50af153c792d7e5da
if (this.isFallFlying()) {
this.updateFallFlying();
}
@@ -3625,9 +3607,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -3632,9 +3614,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
this.calculateEntityAnimation(this instanceof FlyingAnimal);
}
@@ -4224,7 +4224,7 @@ index ddd3acbc804cbc07eaccf578349d3f9e0e00b6fc..0c0144679c9d44d50af153c792d7e5da
if ((!this.isInPowderSnow || !this.canFreeze()) && !this.freezeLocked) { // Paper - Freeze Tick Lock API
this.setTicksFrozen(Math.max(0, this.getTicksFrozen() - 2));
}
@@ -3637,18 +3617,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -3644,18 +3624,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
if (this.tickCount % 40 == 0 && this.isFullyFrozen() && this.canFreeze()) {
this.hurtServer(serverLevel, this.damageSources().freeze(), 1.0F);
}

0
divinemc-server/minecraft-patches/features/0011-lithium-fast_util.patch → divinemc-server/minecraft-patches/features/0010-lithium-fast_util.patch
View File

0
divinemc-server/minecraft-patches/features/0015-C2ME-Optimize-world-gen-math.patch → divinemc-server/minecraft-patches/features/0011-C2ME-Optimize-world-gen-math.patch
View File

0
divinemc-server/minecraft-patches/features/0016-Re-Fix-MC-117075.patch → divinemc-server/minecraft-patches/features/0012-Re-Fix-MC-117075.patch
View File

32
divinemc-server/minecraft-patches/features/0012-lithium-entity.fast_hand_swing-entity.fast_elytra_ch.patch
View File

@@ -1,32 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 01:51:12 +0300
Subject: [PATCH] lithium: entity.fast_hand_swing + entity.fast_elytra_check
This patch is based on the following mixins:
* "net/caffeinemc/mods/lithium/mixin/entity/fast_elytra_check/LivingEntityMixin.java"
* "net/caffeinemc/mods/lithium/mixin/entity/fast_hand_swing/LivingEntityMixin.java"
By: 2No2Name <2No2Name@web.de>
As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index a086c44afc5b3cb04641b4b9cfe28690f6ca2d7e..ab2bfe5589547a5e1b7f26ff100609c4464b61c7 100644
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -2757,6 +2757,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
}
protected void updateSwingTime() {
+ if (!this.swinging && this.swingTime == 0) return; // DivineMC - lithium: entity.fast_hand_swing
int currentSwingDuration = this.getCurrentSwingDuration();
if (this.swinging) {
this.swingTime++;
@@ -3703,6 +3704,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
protected void updateFallFlying() {
this.checkFallDistanceAccumulation();
if (!this.level().isClientSide) {
+ if (!this.isFallFlying() && this.fallFlyTicks == 0) return; // DivineMC - lithium: entity.fast_elytra_check
if (!this.canGlide()) {
if (this.getSharedFlag(7) != false && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
this.setSharedFlag(7, false);

0
divinemc-server/minecraft-patches/features/0024-SparklyPaper-Clear-dirty-stats-after-copying.patch → divinemc-server/minecraft-patches/features/0013-SparklyPaper-Clear-dirty-stats-after-copying.patch
View File

0
divinemc-server/minecraft-patches/features/0025-Async-locate-command.patch → divinemc-server/minecraft-patches/features/0014-Async-locate-command.patch
View File

24
divinemc-server/minecraft-patches/features/0014-C2ME-Reduce-Allocations.patch
View File

@@ -1,24 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 01:53:38 +0300
Subject: [PATCH] C2ME: Reduce Allocations
This patch is based on the following mixin:
"com/ishland/c2me/opts/allocs/mixin/object_pooling_caching/MixinOreFeature.java"
By: ishland <ishlandmc@yeah.net>
As part of: C2ME (https://github.com/RelativityMC/C2ME-fabric)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/net/minecraft/world/level/levelgen/feature/OreFeature.java b/net/minecraft/world/level/levelgen/feature/OreFeature.java
index c7b46efd4f08067e2c9c5c8b0e8b71a94a79823d..45d43707909685d2494f054d4b9e6451af6c2f72 100644
--- a/net/minecraft/world/level/levelgen/feature/OreFeature.java
+++ b/net/minecraft/world/level/levelgen/feature/OreFeature.java
@@ -69,7 +69,7 @@ public class OreFeature extends Feature<OreConfiguration> {
int height
) {
int i = 0;
- BitSet bitSet = new BitSet(width * height * width);
+ BitSet bitSet = org.bxteam.divinemc.util.cache.CachedOrNewBitsGetter.getCachedOrNewBitSet(width * height * width); // DivineMC - C2ME: Reduce Allocations
BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
int i1 = config.size;
double[] doubles = new double[i1 * 4];

0
divinemc-server/minecraft-patches/features/0026-Carpet-Fixes-RecipeManager-Optimize.patch → divinemc-server/minecraft-patches/features/0015-Carpet-Fixes-RecipeManager-Optimize.patch
View File

0
divinemc-server/minecraft-patches/features/0027-lithium-faster-chunk-serialization.patch → divinemc-server/minecraft-patches/features/0016-lithium-faster-chunk-serialization.patch
View File

0
divinemc-server/minecraft-patches/features/0031-C2ME-optimize-noise-generation.patch → divinemc-server/minecraft-patches/features/0017-C2ME-optimize-noise-generation.patch
View File

19
divinemc-server/minecraft-patches/features/0017-Fix-MC-119417.patch
View File

@@ -1,19 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 01:58:51 +0300
Subject: [PATCH] Fix MC-119417
Issue on Mojira: https://bugs.mojang.com/browse/MC/issues/MC-119417
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index f5ef04f2f9324f8b7168bafb02acc74629df6086..1431a2e386bee22ec10365a38ead349a398d551f 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -2227,6 +2227,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, gameMode.getId()));
if (gameMode == GameType.SPECTATOR) {
this.removeEntitiesOnShoulder();
+ this.stopSleeping(); // DivineMC - Fix MC-119417
this.stopRiding();
EnchantmentHelper.stopLocationBasedEffects(this);
} else {

20
divinemc-server/minecraft-patches/features/0018-Fix-MC-7569.patch
View File

@@ -1,20 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 01:59:43 +0300
Subject: [PATCH] Fix MC-7569
Issue on Mojira: https://bugs.mojang.com/browse/MC/issues/MC-7569
diff --git a/net/minecraft/server/rcon/RconConsoleSource.java b/net/minecraft/server/rcon/RconConsoleSource.java
index 1fddeb10c5947c52840e55ca66c50dd4ad5425b9..f50d87c5c4c0c3daa38a70213b8a8af963fff312 100644
--- a/net/minecraft/server/rcon/RconConsoleSource.java
+++ b/net/minecraft/server/rcon/RconConsoleSource.java
@@ -51,7 +51,7 @@ public class RconConsoleSource implements CommandSource {
@Override
public void sendSystemMessage(Component component) {
- this.buffer.append(component.getString());
+ this.buffer.append(component.getString()).append(System.lineSeparator()); // DivineMC - Fix MC-7569
}
@Override

2
divinemc-server/minecraft-patches/features/0034-Optimize-block-state-lookup.patch → divinemc-server/minecraft-patches/features/0018-Optimize-block-state-lookup.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize block state lookup
diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
index d11373d6a88f7b3baaf0e04d4f6e0d3837e2ba3b..6d9274f0da9507d0152611d6b7785e0524dedb2d 100644
index b88254fb3c12b99684c6ede1ae8a6671ffbe9ad6..dbb4142ea38cdf484e74c81103cebb024ae8813d 100644
--- a/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/net/minecraft/world/level/chunk/LevelChunk.java
@@ -270,11 +270,18 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p

0
divinemc-server/minecraft-patches/features/0035-Don-t-respond-ping-before-start-fully.patch → divinemc-server/minecraft-patches/features/0019-Don-t-respond-ping-before-start-fully.patch
View File

19
divinemc-server/minecraft-patches/features/0019-Fix-MC-110386.patch
View File

@@ -1,19 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 02:01:33 +0300
Subject: [PATCH] Fix MC-110386
Issue on Mojira: https://bugs.mojang.com/browse/MC/issues/MC-110386
diff --git a/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java b/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java
index a8ec1d5f4b0fb0ff26a234235b7d8d9c4b4a2a98..6251cfface8d4bedd58271ace3947a1631e61b66 100644
--- a/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java
+++ b/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java
@@ -114,6 +114,7 @@ public class HurtByTargetGoal extends TargetGoal {
}
protected void alertOther(Mob mob, LivingEntity target) {
+ if (mob == target) return; // DivineMC - Fix MC-110386
mob.setTarget(target, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_ATTACKED_NEARBY_ENTITY); // CraftBukkit - reason
}
}

2
divinemc-server/minecraft-patches/features/0036-Respawn-players-that-were-dead-on-server-restart.patch → divinemc-server/minecraft-patches/features/0020-Respawn-players-that-were-dead-on-server-restart.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Respawn players that were dead on server restart
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
index ace14db7bfd154b8a9b27af4a6c57630a3868ac0..abfecaf4467092f7baa02e0f5bbfd23d087f2aa3 100644
index 6498455c4c2838cbee743f016d8be1fe2fb61f6d..141c19eb290080f762da1e2090dae0609f2e3575 100644
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -971,6 +971,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

0
divinemc-server/minecraft-patches/features/0037-Configurable-MC-67.patch → divinemc-server/minecraft-patches/features/0021-Configurable-MC-67.patch
View File

23
divinemc-server/minecraft-patches/features/0021-Fix-MC-31819.patch
View File

@@ -1,23 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 02:03:37 +0300
Subject: [PATCH] Fix MC-31819
Issue on Mojira: https://bugs.mojang.com/browse/MC/issues/MC-31819
diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
index d72e338232b95826b63d784ac0731f5a20bf8dcb..05634e09200fa613b69aafe9b2505dbc9b5c54eb 100644
--- a/net/minecraft/world/entity/player/Player.java
+++ b/net/minecraft/world/entity/player/Player.java
@@ -1817,6 +1817,11 @@ public abstract class Player extends LivingEntity {
}
public void causeFoodExhaustion(float exhaustion, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason reason) {
+ // DivineMC start - Fix MC-31819
+ if (this.level().getDifficulty() == Difficulty.PEACEFUL) {
+ return;
+ }
+ // DivineMC end - Fix MC-31819
// CraftBukkit end
if (!this.abilities.invulnerable) {
if (!this.level().isClientSide) {

0
divinemc-server/minecraft-patches/features/0038-Configurable-MC-59471.patch → divinemc-server/minecraft-patches/features/0022-Configurable-MC-59471.patch
View File

26
divinemc-server/minecraft-patches/features/0022-Fix-MC-172801.patch
View File

@@ -1,26 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 02:04:33 +0300
Subject: [PATCH] Fix MC-172801
Issue on Mojira: https://bugs.mojang.com/browse/MC/issues/MC-172801
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index ab2bfe5589547a5e1b7f26ff100609c4464b61c7..4149e7eb6f583d80ed179b190dcc02acf1144bef 100644
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -3274,7 +3274,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
}
protected float getFlyingSpeed() {
- return this.getControllingPassenger() instanceof net.minecraft.world.entity.player.Player ? this.getSpeed() * 0.1F : 0.02F;
+ // DivineMC start - Fix MC-172801
+ float flyingSpeed = 0.02F;
+ if (this.getAttributes().hasAttribute(Attributes.FLYING_SPEED)) {
+ flyingSpeed = (float) (this.getAttribute(Attributes.FLYING_SPEED).getValue() * 0.049999999254942D);
+ }
+ return this.getControllingPassenger() instanceof net.minecraft.world.entity.player.Player ? this.getSpeed() * 0.1F : flyingSpeed;
+ // DivineMC end - Fix MC-172801
}
public float getSpeed() {

0
divinemc-server/minecraft-patches/features/0039-Use-Java-s-Math-functions.patch → divinemc-server/minecraft-patches/features/0023-Use-Java-s-Math-functions.patch
View File

0
divinemc-server/minecraft-patches/features/0040-Disable-leaf-decay.patch → divinemc-server/minecraft-patches/features/0024-Disable-leaf-decay.patch
View File

0
divinemc-server/minecraft-patches/features/0041-Carpet-Fixes-Fix-Slime-Block-Bounce-Logic.patch → divinemc-server/minecraft-patches/features/0025-Carpet-Fixes-Fix-Slime-Block-Bounce-Logic.patch
View File

0
divinemc-server/minecraft-patches/features/0042-Optimize-entity-brain.patch → divinemc-server/minecraft-patches/features/0026-Optimize-entity-brain.patch
View File

0
divinemc-server/minecraft-patches/features/0043-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch → divinemc-server/minecraft-patches/features/0027-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch
View File

0
divinemc-server/minecraft-patches/features/0044-Carpet-Fixes-Optimized-getBiome-method.patch → divinemc-server/minecraft-patches/features/0028-Carpet-Fixes-Optimized-getBiome-method.patch
View File

0
divinemc-server/minecraft-patches/features/0045-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch → divinemc-server/minecraft-patches/features/0029-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch
View File

0
divinemc-server/minecraft-patches/features/0046-Carpet-Fixes-Sheep-Optimization.patch → divinemc-server/minecraft-patches/features/0030-Carpet-Fixes-Sheep-Optimization.patch
View File

0
divinemc-server/minecraft-patches/features/0047-Carpet-AMS-Addition-Optimized-dragon-respawn.patch → divinemc-server/minecraft-patches/features/0031-Carpet-AMS-Addition-Optimized-dragon-respawn.patch
View File

2
divinemc-server/minecraft-patches/features/0048-ModernFix-compact_bit_storage.patch → divinemc-server/minecraft-patches/features/0032-ModernFix-compact_bit_storage.patch
View File

@@ -10,7 +10,7 @@ As part of: ModernFix (https://github.com/embeddedt/ModernFix)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/net/minecraft/world/level/chunk/PalettedContainer.java b/net/minecraft/world/level/chunk/PalettedContainer.java
index be11a87ab1badca64219d74bc7a4f5d51b818a8c..a87689919a5fd4774eaff534ca85243feb505e84 100644
index 9d892c1c3890e0aaf13fd5cd7b7d138afeaad260..ca3fab804e464a5db2b47495ecb588a96044265d 100644
--- a/net/minecraft/world/level/chunk/PalettedContainer.java
+++ b/net/minecraft/world/level/chunk/PalettedContainer.java
@@ -291,6 +291,28 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer

19
divinemc-server/minecraft-patches/features/0033-Fix-sprint-glitch.patch
View File

@@ -1,19 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 02:43:50 +0300
Subject: [PATCH] Fix sprint glitch
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index 4149e7eb6f583d80ed179b190dcc02acf1144bef..9a000a4df5df6e36ae25e6d54bfe7cd725df51dd 100644
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -1420,7 +1420,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
player.setRealHealth(health);
}
- player.updateScaledHealth(false);
+ this.entityData.set(LivingEntity.DATA_HEALTH_ID, player.getScaledHealth()); // DivineMC - Fix sprint glitch
return;
}
// CraftBukkit end

0
divinemc-server/minecraft-patches/features/0049-Option-to-disable-disconnect.spam.patch → divinemc-server/minecraft-patches/features/0033-Option-to-disable-disconnect.spam.patch
View File

0
divinemc-server/minecraft-patches/features/0050-Option-to-disable-saving-of-snowball-and-firework.patch → divinemc-server/minecraft-patches/features/0034-Option-to-disable-saving-of-snowball-and-firework.patch
View File

0
divinemc-server/minecraft-patches/features/0051-Snowball-and-Egg-knockback.patch → divinemc-server/minecraft-patches/features/0035-Snowball-and-Egg-knockback.patch
View File

2
divinemc-server/minecraft-patches/features/0052-Optimize-suffocation.patch → divinemc-server/minecraft-patches/features/0036-Optimize-suffocation.patch
View File

@@ -7,7 +7,7 @@ Original license: GPL v3
Original project: https://github.com/pufferfish-gg/Pufferfish
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index d382a9760c0379f3d1c3bc65303d1de250858343..49cb64c6dd0941eab8f7531e0c182a79e4ec1da6 100644
index 8df6ceea1536b12d87755c8a69e1b652d280600c..33f33a51a7016e214bca1aec8e6cc3910ec3bb42 100644
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -420,6 +420,12 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin

0
divinemc-server/minecraft-patches/features/0053-Reduce-chunk-loading-lookups.patch → divinemc-server/minecraft-patches/features/0037-Reduce-chunk-loading-lookups.patch
View File

0
divinemc-server/minecraft-patches/features/0054-Configurable-movement-speed-for-entities.patch → divinemc-server/minecraft-patches/features/0038-Configurable-movement-speed-for-entities.patch
View File

0
divinemc-server/minecraft-patches/features/0055-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch → divinemc-server/minecraft-patches/features/0039-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch
View File

0
divinemc-server/minecraft-patches/features/0056-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch → divinemc-server/minecraft-patches/features/0040-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch
View File

2
divinemc-server/minecraft-patches/features/0057-Option-to-allow-weird-movement-and-disable-teleporti.patch → divinemc-server/minecraft-patches/features/0041-Option-to-allow-weird-movement-and-disable-teleporti.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Option to allow weird movement and disable teleporting
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 8f4bca6a99b35e869e34f0fa216c13189cd7b384..3ba558634558b4524245a2b29786237f5e38ef42 100644
index fe7d68f3947bf55a389c73ef301fae8e396bf1da..39b95d3736d5acd3b71675410469727be6405cd3 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -607,7 +607,7 @@ public class ServerGamePacketListenerImpl

0
divinemc-server/minecraft-patches/features/0058-Optimize-Raids.patch → divinemc-server/minecraft-patches/features/0042-Optimize-Raids.patch
View File

0
divinemc-server/minecraft-patches/features/0059-SparklyPaper-Optimize-canSee-checks.patch → divinemc-server/minecraft-patches/features/0043-SparklyPaper-Optimize-canSee-checks.patch
View File

0
divinemc-server/minecraft-patches/features/0060-Small-optimization-to-LinearPalette.patch → divinemc-server/minecraft-patches/features/0044-Small-optimization-to-LinearPalette.patch
View File

0
divinemc-server/minecraft-patches/features/0061-Use-switch-for-VarInt-write.patch → divinemc-server/minecraft-patches/features/0045-Use-switch-for-VarInt-write.patch
View File

0
divinemc-server/minecraft-patches/features/0062-Optimize-Fluids.patch → divinemc-server/minecraft-patches/features/0046-Optimize-Fluids.patch
View File

0
divinemc-server/minecraft-patches/features/0063-Optimize-Structure-Generation.patch → divinemc-server/minecraft-patches/features/0047-Optimize-Structure-Generation.patch
View File

4
divinemc-server/minecraft-patches/features/0064-Implement-NoChatReports.patch → divinemc-server/minecraft-patches/features/0048-Implement-NoChatReports.patch
View File

@@ -206,7 +206,7 @@ index a491be4250de3199c3e1aa9e5482b568692bd2f5..c88826db76c28c536e6c36c5592d69c1
private static final String PREFIX = "data:image/png;base64,";
public static final Codec<ServerStatus.Favicon> CODEC = Codec.STRING.comapFlatMap(string -> {
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
index a947fc31f6261531b6f28e5af577e74ca84f2132..021e1cb762d23ebe885a3f190ba2431e1db99bb8 100644
index ac35fc08574a72be356c48fb6e1cfafe36cd0860..dcd004749846aa9e650be438b0f097e414c2ec76 100644
--- a/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
@@ -623,6 +623,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -287,7 +287,7 @@ index 667ef5b2ab50eeb0491f7fe0bc8913ec29a4603a..a7c4fad2b1cb0cbac742a18d37d688bb
if (packet == null || this.processedDisconnect) { // Spigot
return;
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
index fb1b9f75cffeb15875e6690a0e030f8a4fd8b276..6713eb83b36f115e72fa5999c413e59e4f634f9f 100644
index 7ed75ef10e3d4504cebb0ad544e05d9544642c9e..3165fd57f8f04251f220716beab49f6f43736eeb 100644
--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
@@ -276,7 +276,7 @@ public abstract class PlayerList {

8
divinemc-server/minecraft-patches/features/0065-Lag-compensation.patch → divinemc-server/minecraft-patches/features/0049-Lag-compensation.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Lag compensation
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
index 7a3775185d5c80f43456a595f22a9ebf19760bd6..23144971acc04bbeacd719dafe2363d1618153b9 100644
index 141c19eb290080f762da1e2090dae0609f2e3575..5a7cb4cffa218a17300c74ee4d95b08b705324ea 100644
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -288,6 +288,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -16,7 +16,7 @@ index 7a3775185d5c80f43456a595f22a9ebf19760bd6..23144971acc04bbeacd719dafe2363d1
public static <S extends MinecraftServer> S spin(Function<Thread, S> threadFunction) {
ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.init(); // Paper - rewrite data converter system
@@ -1534,6 +1535,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1535,6 +1536,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
this.server.spark.tickStart(); // Paper - spark
@@ -66,7 +66,7 @@ index 4a2cace22512fe06c1713bc8735e775e3012f3bc..85c4d709b6d04e8f43baf7b900ee59ea
this.serverLevelData.setDayTime(time);
// Purpur start - Configurable daylight cycle
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index 49cb64c6dd0941eab8f7531e0c182a79e4ec1da6..a6a7af2393c15f92683f05500bd4f45b1b1f4853 100644
index 33f33a51a7016e214bca1aec8e6cc3910ec3bb42..327b3b1463caafc69e6a5dc0eee577f4af49d202 100644
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -523,6 +523,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -248,7 +248,7 @@ index 8db95b74f88f8096de93115ae8d3fb2e6184ad3b..e044830439fe9821ab3f62695d318a63
}
diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
index a2b21970841a0f7f2b4b469c7b8737440041ebaa..cf2ff202103fde0607e4dacef1a976c36b7840ef 100644
index 32f17328b7980a9dc382c90af76cca04b74c639a..6f25be39103cd0bb26bc365d9599b9846c6fe133 100644
--- a/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/net/minecraft/world/level/chunk/LevelChunk.java
@@ -917,6 +917,19 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p

6
divinemc-server/minecraft-patches/features/0066-Virtual-Threads.patch → divinemc-server/minecraft-patches/features/0050-Virtual-Threads.patch
View File

@@ -36,10 +36,10 @@ index 758ce439d2e10e6ef42a58d147a77093667e0acd..de622982f864d96a5b76efcd69f1836e
new java.util.concurrent.LinkedBlockingQueue<>(),
new com.google.common.util.concurrent.ThreadFactoryBuilder()
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
index 23144971acc04bbeacd719dafe2363d1618153b9..7dbefd83d164a7d97a56b02862fef3b2f17d5aab 100644
index 5a7cb4cffa218a17300c74ee4d95b08b705324ea..4a53105e46e338a52bc5ad22d51688a9a261d9e5 100644
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -2639,8 +2639,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2640,8 +2640,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
@@ -54,7 +54,7 @@ index 23144971acc04bbeacd719dafe2363d1618153b9..7dbefd83d164a7d97a56b02862fef3b2
public ChatDecorator getChatDecorator() {
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 3ba558634558b4524245a2b29786237f5e38ef42..b6f67c4359e718db8eb9240a22e71fd0b1bc6d05 100644
index 39b95d3736d5acd3b71675410469727be6405cd3..253eb728773ab09023e8db56bb6382d9e21a96b3 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -836,8 +836,11 @@ public class ServerGamePacketListenerImpl

0
divinemc-server/minecraft-patches/features/0067-Async-Chunk-Sending.patch → divinemc-server/minecraft-patches/features/0051-Async-Chunk-Sending.patch
View File

0
divinemc-server/minecraft-patches/features/0068-Command-block-parse-results-caching.patch → divinemc-server/minecraft-patches/features/0052-Command-block-parse-results-caching.patch
View File

0
divinemc-server/minecraft-patches/features/0069-Player-ProfileResult-caching.patch → divinemc-server/minecraft-patches/features/0053-Player-ProfileResult-caching.patch
View File

0
divinemc-server/minecraft-patches/features/0070-Implement-Secure-Seed.patch → divinemc-server/minecraft-patches/features/0054-Implement-Secure-Seed.patch
View File

4
divinemc-server/minecraft-patches/features/0071-Dynamic-Activation-of-Brain.patch → divinemc-server/minecraft-patches/features/0055-Dynamic-Activation-of-Brain.patch
View File

@@ -43,7 +43,7 @@ index 421b59b24bda3d03dea8fd0fc6237a71900e1cdc..78bf3365b426e7090182af84630111d4
if (!tickRateManager.isEntityFrozen(entity)) {
entity.checkDespawn();
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index 39076c52a1ed15d1403d08851d53787a9055d6ee..cad10bd55ac1e52d00b3b9c3205562b346c54e2a 100644
index 5bc7f37290eb99145a2ea3e40d31180f3494979b..bdf9899f960b6cca3529af97ebff738761208439 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -365,6 +365,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -239,7 +239,7 @@ index c6e4966d3e4fdb7c91577fc1693fb66930b4f3dc..85963b74a533beb7883ea417ceb3c21d
@Override
diff --git a/net/minecraft/world/entity/animal/frog/Tadpole.java b/net/minecraft/world/entity/animal/frog/Tadpole.java
index c0e12a6e5dd2b7e12e4cc40f6795228de6b470cc..d8eb93431f4ef8720ccfd58cf5e7942ccb1184c2 100644
index f85626b690b02908fac3979d277b293ec48aa451..30eeb222753d6c715a2d3066e74ef3fa148c904f 100644
--- a/net/minecraft/world/entity/animal/frog/Tadpole.java
+++ b/net/minecraft/world/entity/animal/frog/Tadpole.java
@@ -65,6 +65,7 @@ public class Tadpole extends AbstractFish {

0
divinemc-server/minecraft-patches/features/0072-Petal-Async-Pathfinding.patch → divinemc-server/minecraft-patches/features/0056-Petal-Async-Pathfinding.patch
View File

4
divinemc-server/minecraft-patches/features/0073-Petal-Multithreaded-Tracker.patch → divinemc-server/minecraft-patches/features/0057-Petal-Multithreaded-Tracker.patch
View File

@@ -399,7 +399,7 @@ index 78bf3365b426e7090182af84630111d410a2460e..3c1795eb56900cd80cfec38bd1d922d5
}
}
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index b6f67c4359e718db8eb9240a22e71fd0b1bc6d05..bc738535f67d789e9d240b245e9247e026b3c751 100644
index 253eb728773ab09023e8db56bb6382d9e21a96b3..42ab4f50d07539aafba120e863d5b9cfc5a436e8 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1934,7 +1934,6 @@ public class ServerGamePacketListenerImpl
@@ -411,7 +411,7 @@ index b6f67c4359e718db8eb9240a22e71fd0b1bc6d05..bc738535f67d789e9d240b245e9247e0
if (this.player.isRemoved()) {
LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index a6a7af2393c15f92683f05500bd4f45b1b1f4853..6ac8209ec468ec4f65f75b383478eee0b537fabf 100644
index 327b3b1463caafc69e6a5dc0eee577f4af49d202..683a8913ef4e71ae3072b520d0e0a6a73c96a13c 100644
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -1353,13 +1353,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin

2
divinemc-server/minecraft-patches/features/0074-Pufferfish-Optimize-mob-spawning.patch → divinemc-server/minecraft-patches/features/0058-Pufferfish-Optimize-mob-spawning.patch
View File

@@ -9,7 +9,7 @@ Original project: https://github.com/pufferfish-gg/Pufferfish
This patch reduces the main-thread impact of mob spawning by moving spawning work to other threads
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
index 7dbefd83d164a7d97a56b02862fef3b2f17d5aab..985a5168f7f81fb934e791618362b7c6e71ff893 100644
index 4a53105e46e338a52bc5ad22d51688a9a261d9e5..ed4a722c0fa458a0977366b92561d6a16827da56 100644
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -289,6 +289,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

0
divinemc-server/minecraft-patches/features/0075-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch → divinemc-server/minecraft-patches/features/0059-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch
View File

0
divinemc-server/minecraft-patches/features/0076-C2ME-Density-Function-Compiler.patch → divinemc-server/minecraft-patches/features/0060-C2ME-Density-Function-Compiler.patch
View File

0
divinemc-server/minecraft-patches/features/0077-Clump-experience-orbs.patch → divinemc-server/minecraft-patches/features/0061-Clump-experience-orbs.patch
View File

14
divinemc-server/minecraft-patches/features/0078-SparklyPaper-Parallel-world-ticking.patch → divinemc-server/minecraft-patches/features/0062-SparklyPaper-Parallel-world-ticking.patch
View File

@@ -82,7 +82,7 @@ index ac27ff24f018d8798921c5152e679ceed1e88d8d..ec7d1353b19e55b00c558df8981323ef
List<org.bukkit.block.BlockState> states = new java.util.ArrayList<>(level.capturedBlockStates.values());
level.capturedBlockStates.clear();
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
index 985a5168f7f81fb934e791618362b7c6e71ff893..acbae905cd22511be417600c68c6944b80acd2d7 100644
index ed4a722c0fa458a0977366b92561d6a16827da56..9f5beb74d8b0198aebf7cad40def52d12a4a9b3d 100644
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -290,6 +290,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -143,7 +143,7 @@ index 985a5168f7f81fb934e791618362b7c6e71ff893..acbae905cd22511be417600c68c6944b
}
@Override
@@ -1660,6 +1673,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1661,6 +1674,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public final io.papermc.paper.threadedregions.EntityScheduler.EntitySchedulerTickList entitySchedulerTickList = new io.papermc.paper.threadedregions.EntityScheduler.EntitySchedulerTickList(); // Paper - optimise Folia entity scheduler
@@ -162,7 +162,7 @@ index 985a5168f7f81fb934e791618362b7c6e71ff893..acbae905cd22511be417600c68c6944b
protected void tickChildren(BooleanSupplier hasTimeLeft) {
this.getPlayerList().getPlayers().forEach(serverPlayer1 -> serverPlayer1.connection.suspendFlushing());
this.server.getScheduler().mainThreadHeartbeat(); // CraftBukkit
@@ -1705,28 +1730,43 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1706,28 +1731,43 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
this.isIteratingOverLevels = true; // Paper - Throw exception on world create while being ticked
@@ -224,7 +224,7 @@ index 985a5168f7f81fb934e791618362b7c6e71ff893..acbae905cd22511be417600c68c6944b
this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
this.tickConnection();
@@ -1804,6 +1844,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1805,6 +1845,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
Map<ResourceKey<Level>, ServerLevel> oldLevels = this.levels;
Map<ResourceKey<Level>, ServerLevel> newLevels = Maps.newLinkedHashMap(oldLevels);
newLevels.remove(level.dimension());
@@ -233,7 +233,7 @@ index 985a5168f7f81fb934e791618362b7c6e71ff893..acbae905cd22511be417600c68c6944b
}
// CraftBukkit end
diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java
index 10e5469df1800bcdfb3f8cb4045ee25a4bafc58c..8efed0ffdc906b6c1ba054831e481f53c11f102d 100644
index 3836d60ce84fb26f30a609486a5755d3fd1c94f1..1aab02441e4dfa7703963855d77bb918dee7a6fc 100644
--- a/net/minecraft/server/PlayerAdvancements.java
+++ b/net/minecraft/server/PlayerAdvancements.java
@@ -54,6 +54,7 @@ public class PlayerAdvancements {
@@ -333,7 +333,7 @@ index 10e5469df1800bcdfb3f8cb4045ee25a4bafc58c..8efed0ffdc906b6c1ba054831e481f53
}
} else if (this.visible.remove(advancementHolder)) {
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
index 021e1cb762d23ebe885a3f190ba2431e1db99bb8..8820d1789192247c52b4d821abf2dd23c0bf1b62 100644
index dcd004749846aa9e650be438b0f097e414c2ec76..5a2b9632a1e46b512a1379923765c1b8a28250b9 100644
--- a/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
@@ -218,6 +218,13 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -513,7 +513,7 @@ index 1431a2e386bee22ec10365a38ead349a398d551f..77d1cab278a13e08ba8096af2c683b50
// Paper end - Inventory close reason
this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
index 6713eb83b36f115e72fa5999c413e59e4f634f9f..08e337ae96c444da2e50240c808c76a548cd4c12 100644
index 3165fd57f8f04251f220716beab49f6f43736eeb..df47a3dc31a01464088eba21f4139f63d69895e5 100644
--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
@@ -149,6 +149,7 @@ public abstract class PlayerList {

4
divinemc-server/minecraft-patches/features/0079-MSPT-Tracking-for-each-world.patch → divinemc-server/minecraft-patches/features/0063-MSPT-Tracking-for-each-world.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] MSPT Tracking for each world
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
index 101dce7741f74dd79b333fd6cf38a97cb0c832f8..c0a272285e244e0267e6ef776aef14524e63c076 100644
index 9f5beb74d8b0198aebf7cad40def52d12a4a9b3d..4bbb9b8701e4f5a411a12b8fd977e6de19a22b26 100644
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -1676,7 +1676,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1677,7 +1677,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// DivineMC start - Parallel world ticking
private void tickLevel(ServerLevel serverLevel, BooleanSupplier hasTimeLeft) {
try {

4
divinemc-server/minecraft-patches/features/0080-Catch-update-suppressors.patch → divinemc-server/minecraft-patches/features/0064-Catch-update-suppressors.patch
View File

@@ -20,10 +20,10 @@ index 4535858701b2bb232b9d2feb2af6551526232ddc..aa4dd7517e8be167aef1eaf7aa907e3c
if (var4 instanceof ReportedException reportedException && reportedException.getCause() instanceof OutOfMemoryError) {
throw makeReportedException(var4, packet, processor);
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
index c0a272285e244e0267e6ef776aef14524e63c076..99bdd73e13096c692c06fe0b32b90cd9a68bb477 100644
index 4bbb9b8701e4f5a411a12b8fd977e6de19a22b26..b31a4edee0616a63026f7a4335205f2d99d2f641 100644
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -1685,6 +1685,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1686,6 +1686,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
serverLevel.tickTimes10s.add(this.tickCount, j);
serverLevel.tickTimes60s.add(this.tickCount, j);
// DivineMC end - MSPT Tracking for each world

0
divinemc-server/minecraft-patches/features/0081-Regionized-Chunk-Ticking.patch → divinemc-server/minecraft-patches/features/0065-Regionized-Chunk-Ticking.patch
View File

0
divinemc-server/minecraft-patches/features/0083-C2ME-Limit-NBT-cache.patch → divinemc-server/minecraft-patches/features/0066-C2ME-Limit-NBT-cache.patch
View File

0
divinemc-server/minecraft-patches/features/0085-C2ME-Optimize-Aquifer-and-Beardifier.patch → divinemc-server/minecraft-patches/features/0067-C2ME-Optimize-Aquifer-and-Beardifier.patch
View File

0
divinemc-server/minecraft-patches/features/0087-Copper-Bulb-1gt-delay.patch → divinemc-server/minecraft-patches/features/0068-Copper-Bulb-1gt-delay.patch
View File

0
divinemc-server/minecraft-patches/features/0088-Crafter-1gt-delay.patch → divinemc-server/minecraft-patches/features/0069-Crafter-1gt-delay.patch
View File

0
divinemc-server/minecraft-patches/features/0089-Raytrace-Entity-Tracker.patch → divinemc-server/minecraft-patches/features/0070-Raytrace-Entity-Tracker.patch
View File

0
divinemc-server/minecraft-patches/features/0090-Async-Join-Thread.patch → divinemc-server/minecraft-patches/features/0071-Async-Join-Thread.patch
View File

4
divinemc-server/minecraft-patches/features/0092-Leaves-Protocol-Core.patch → divinemc-server/minecraft-patches/features/0072-Leaves-Protocol-Core.patch
View File

@@ -67,7 +67,7 @@ index b31a4edee0616a63026f7a4335205f2d99d2f641..0072f3f07b1962adc1766930bb9a2f70
this.tickables.get(i).run();
}
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index 86470728c2d03063c4eb0c43cfe323e809cac846..cd43a45b7dfca2520972d2156df8b6069ce54f34 100644
index 77d1cab278a13e08ba8096af2c683b5042cc1574..74b639bec2243800077a4fe579fcfeadc514e30d 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -432,6 +432,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -113,7 +113,7 @@ index 42ab4f50d07539aafba120e863d5b9cfc5a436e8..e8fd78e2898931f65e783ad46b5b73ce
}
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
index 08e337ae96c444da2e50240c808c76a548cd4c12..f65599e41ca77756cc9bfb87c4a86606eed127cf 100644
index df47a3dc31a01464088eba21f4139f63d69895e5..a695a3152dbc72f1b20c713574763455b2569e1c 100644
--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
@@ -343,6 +343,11 @@ public abstract class PlayerList {

2
divinemc-server/minecraft-patches/features/0093-Leaves-Xaero-s-Map-Protocol.patch → divinemc-server/minecraft-patches/features/0073-Leaves-Xaero-s-Map-Protocol.patch
View File

@@ -7,7 +7,7 @@ Original project: https://github.com/LeavesMC/Leaves
Original license: GPLv3
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
index f65599e41ca77756cc9bfb87c4a86606eed127cf..753f921042c8fcfc0eb6c2dca7f80751df4909e3 100644
index a695a3152dbc72f1b20c713574763455b2569e1c..96af2c75b526c59510965665da0b2ca00bf657b3 100644
--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
@@ -1172,6 +1172,7 @@ public abstract class PlayerList {

2
divinemc-server/minecraft-patches/features/0094-Leaves-Syncmatica-Protocol.patch → divinemc-server/minecraft-patches/features/0074-Leaves-Syncmatica-Protocol.patch
View File

@@ -7,7 +7,7 @@ Original project: https://github.com/LeavesMC/Leaves
Original license: GPLv3
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 9d771e7fba94c09df602a249f58a9caf1d339bcf..db85f8f905425316f893d0adccdeef53517faba8 100644
index e8fd78e2898931f65e783ad46b5b73ce3fbde235..75d9d06066c750ac9a176adc021410f1265cd36f 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -313,6 +313,7 @@ public class ServerGamePacketListenerImpl

0
divinemc-server/minecraft-patches/features/0095-Paper-PR-Optimise-non-flush-packet-sending.patch → divinemc-server/minecraft-patches/features/0075-Paper-PR-Optimise-non-flush-packet-sending.patch
View File

0
divinemc-server/minecraft-patches/features/0096-Linear-region-file-format.patch → divinemc-server/minecraft-patches/features/0076-Linear-region-file-format.patch
View File

0
divinemc-server/minecraft-patches/features/0097-Cleanup-dead-code-from-Paper.patch → divinemc-server/minecraft-patches/features/0077-Cleanup-dead-code-from-Paper.patch
View File

19
divinemc-server/minecraft-patches/features/0086-Disable-offline-warn-if-using-proxy.patch
View File

@@ -1,19 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Thu, 10 Jul 2025 04:21:08 +0300
Subject: [PATCH] Disable offline warn if using proxy
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
index 8820d1789192247c52b4d821abf2dd23c0bf1b62..5a2b9632a1e46b512a1379923765c1b8a28250b9 100644
--- a/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
@@ -305,7 +305,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
// Paper end - Add Velocity IP Forwarding Support
- if (!this.usesAuthentication()) {
+ if (!io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) { // DivineMC - Disable offline warn if using proxy
LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
// Spigot start

10
divinemc-server/minecraft-patches/features/0084-Configurable-player-spawn-tracking-range.patch → divinemc-server/minecraft-patches/sources/ca/spottedleaf/moonrise/patches/chunk_tick_iteration/ChunkTickConstants.java.patch
View File

@@ -1,14 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Wed, 9 Jul 2025 04:40:45 +0300
Subject: [PATCH] Configurable player spawn tracking range
diff --git a/ca/spottedleaf/moonrise/patches/chunk_tick_iteration/ChunkTickConstants.java b/ca/spottedleaf/moonrise/patches/chunk_tick_iteration/ChunkTickConstants.java
index 6d1fe8028739145b11fce98ad62b2f8044299548..9f086ded18d1fc8850877c6be113d88074427526 100644
--- a/ca/spottedleaf/moonrise/patches/chunk_tick_iteration/ChunkTickConstants.java
+++ b/ca/spottedleaf/moonrise/patches/chunk_tick_iteration/ChunkTickConstants.java
@@ -2,7 +2,7 @@ package ca.spottedleaf.moonrise.patches.chunk_tick_iteration;
@@ -2,7 +_,7 @@
public final class ChunkTickConstants {

10
divinemc-server/minecraft-patches/features/0032-Skip-cloning-advancement-criteria.patch → divinemc-server/minecraft-patches/sources/net/minecraft/advancements/Advancement.java.patch
View File

@@ -1,14 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 02:42:57 +0300
Subject: [PATCH] Skip cloning advancement criteria
diff --git a/net/minecraft/advancements/Advancement.java b/net/minecraft/advancements/Advancement.java
index ac6a85ddf6eb326b3fd53341a4a5db7bd00b7ce2..52a285db9557b2e44d2dcae9fabdb0d78d3e7ec6 100644
--- a/net/minecraft/advancements/Advancement.java
+++ b/net/minecraft/advancements/Advancement.java
@@ -61,7 +61,7 @@ public record Advancement(
@@ -61,7 +_,7 @@
AdvancementRequirements requirements,
boolean sendsTelemetryEvent
) {

13
divinemc-server/minecraft-patches/features/0013-lithium-cached_iterate_outwards.patch → divinemc-server/minecraft-patches/sources/net/minecraft/core/BlockPos.java.patch
View File

@@ -1,17 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 01:52:18 +0300
Subject: [PATCH] lithium: cached_iterate_outwards
By: 2No2Name <2No2Name@web.de>
As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
diff --git a/net/minecraft/core/BlockPos.java b/net/minecraft/core/BlockPos.java
index 6518d3fff6daf331b24a7bf5b39fa1920b73711d..0dc73d76c2d86e05bedb3eb4f51d638c17390277 100644
--- a/net/minecraft/core/BlockPos.java
+++ b/net/minecraft/core/BlockPos.java
@@ -347,7 +347,18 @@ public class BlockPos extends Vec3i {
@@ -347,7 +_,18 @@
};
}

10
divinemc-server/minecraft-patches/features/0091-Shutdown-executors.patch → divinemc-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch
View File

@@ -1,14 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Thu, 10 Jul 2025 17:39:29 +0300
Subject: [PATCH] Shutdown executors
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
index 6361d8abdeb045923e8ce64f02cbb7a9ed949d1e..b31a4edee0616a63026f7a4335205f2d99d2f641 100644
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -1081,6 +1081,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1080,6 +_,7 @@
// Paper end - rewrite chunk system
// Paper start - Improved watchdog support - move final shutdown items here
Util.shutdownExecutors();

10
divinemc-server/minecraft-patches/features/0082-Use-fastutil-for-criterion-data.patch → divinemc-server/minecraft-patches/sources/net/minecraft/server/PlayerAdvancements.java.patch
View File

@@ -1,14 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Wed, 9 Jul 2025 03:41:32 +0300
Subject: [PATCH] Use fastutil for criterion data
diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java
index 8efed0ffdc906b6c1ba054831e481f53c11f102d..1aab02441e4dfa7703963855d77bb918dee7a6fc 100644
--- a/net/minecraft/server/PlayerAdvancements.java
+++ b/net/minecraft/server/PlayerAdvancements.java
@@ -61,7 +61,7 @@ public class PlayerAdvancements {
@@ -60,7 +_,7 @@
private AdvancementHolder lastSelectedTab;
private boolean isFirstPacket = true;
private final Codec<PlayerAdvancements.Data> codec;

23
divinemc-server/minecraft-patches/features/0010-Pufferfish-SIMD-support.patch → divinemc-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch
View File

@@ -1,17 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 02:55:43 +0300
Subject: [PATCH] Pufferfish: SIMD support
Original license: GPL v3
Original project: https://github.com/pufferfish-gg/Pufferfish
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
index 06657a0fbf65dd095519d706dd5a8e1d8b6b381a..a947fc31f6261531b6f28e5af577e74ca84f2132 100644
--- a/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
@@ -198,6 +198,26 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
org.bxteam.divinemc.command.DivineCommands.registerCommands(this); // DivineMC - Configuration
@@ -195,6 +_,26 @@
// Purpur end - Purpur config files
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
+ // DivineMC start - Pufferfish SIMD
@@ -37,3 +27,12 @@ index 06657a0fbf65dd095519d706dd5a8e1d8b6b381a..a947fc31f6261531b6f28e5af577e74c
this.setPvpAllowed(properties.pvp);
this.setFlightAllowed(properties.allowFlight);
this.setMotd(properties.motd);
@@ -275,7 +_,7 @@
String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
// Paper end - Add Velocity IP Forwarding Support
- if (!this.usesAuthentication()) {
+ if (!io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) { // DivineMC - Disable offline warn if using proxy
LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
// Spigot start

10
divinemc-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch Normal file
View File

@@ -0,0 +1,10 @@
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -2233,6 +_,7 @@
this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, gameMode.getId()));
if (gameMode == GameType.SPECTATOR) {
this.removeEntitiesOnShoulder();
+ this.stopSleeping(); // DivineMC - Fix MC-119417
this.stopRiding();
EnchantmentHelper.stopLocationBasedEffects(this);
} else {

11
divinemc-server/minecraft-patches/sources/net/minecraft/server/rcon/RconConsoleSource.java.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/net/minecraft/server/rcon/RconConsoleSource.java
+++ b/net/minecraft/server/rcon/RconConsoleSource.java
@@ -51,7 +_,7 @@
@Override
public void sendSystemMessage(Component component) {
- this.buffer.append(component.getString());
+ this.buffer.append(component.getString()).append(System.lineSeparator()); // DivineMC - Fix MC-7569
}
@Override

19
divinemc-server/minecraft-patches/features/0029-VMP-skip-entity-move-if-movement-is-zero.patch → divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch
View File

@@ -1,19 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 02:30:53 +0300
Subject: [PATCH] VMP: skip entity move if movement is zero
This patch is based on the following mixin:
"com/ishland/vmp/mixins/entity/move_zero_velocity/MixinEntity.java"
By: ishland <ishlandmc@yeah.net>
As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index 02f39e3dc420a5bd49cd6e247c9b1894dc49d303..0171befef713e89d9241c7735d5d285b23373e8f 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -372,6 +372,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -374,6 +_,7 @@
public boolean isTemporarilyActive;
public long activatedImmunityTick = Integer.MIN_VALUE;
public @Nullable Boolean immuneToFire = null; // Purpur - Fire immune API
@@ -21,7 +8,7 @@ index 02f39e3dc420a5bd49cd6e247c9b1894dc49d303..0171befef713e89d9241c7735d5d285b
public void inactiveTick() {
}
@@ -1119,6 +1120,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1125,6 +_,7 @@
// Paper end - detailed watchdog information
public void move(MoverType type, Vec3 movement) {
@@ -29,7 +16,7 @@ index 02f39e3dc420a5bd49cd6e247c9b1894dc49d303..0171befef713e89d9241c7735d5d285b
final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
// Paper start - detailed watchdog information
ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
@@ -4425,6 +4427,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4448,6 +_,7 @@
}
public final void setBoundingBox(AABB bb) {

42
divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch Normal file
View File

@@ -0,0 +1,42 @@
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -1425,7 +_,7 @@
player.setRealHealth(health);
}
- player.updateScaledHealth(false);
+ this.entityData.set(LivingEntity.DATA_HEALTH_ID, player.getScaledHealth()); // DivineMC - Fix sprint glitch
return;
}
// CraftBukkit end
@@ -2762,6 +_,7 @@
}
protected void updateSwingTime() {
+ if (!this.swinging && this.swingTime == 0) return; // DivineMC - lithium: entity.fast_hand_swing
int currentSwingDuration = this.getCurrentSwingDuration();
if (this.swinging) {
this.swingTime++;
@@ -3278,7 +_,13 @@
}
protected float getFlyingSpeed() {
- return this.getControllingPassenger() instanceof net.minecraft.world.entity.player.Player ? this.getSpeed() * 0.1F : 0.02F;
+ // DivineMC start - Fix MC-172801
+ float flyingSpeed = 0.02F;
+ if (this.getAttributes().hasAttribute(Attributes.FLYING_SPEED)) {
+ flyingSpeed = (float) (this.getAttribute(Attributes.FLYING_SPEED).getValue() * 0.049999999254942D);
+ }
+ return this.getControllingPassenger() instanceof net.minecraft.world.entity.player.Player ? this.getSpeed() * 0.1F : flyingSpeed;
+ // DivineMC end - Fix MC-172801
}
public float getSpeed() {
@@ -3727,6 +_,7 @@
protected void updateFallFlying() {
this.checkFallDistanceAccumulation();
if (!this.level().isClientSide) {
+ if (!this.isFallFlying() && this.fallFlyTicks == 0) return; // DivineMC - lithium: entity.fast_elytra_check
if (!this.canGlide()) {
if (this.getSharedFlag(7) != false && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
this.setSharedFlag(7, false);

10
divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java.patch Normal file
View File

@@ -0,0 +1,10 @@
--- a/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java
+++ b/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java
@@ -114,6 +_,7 @@
}
protected void alertOther(Mob mob, LivingEntity target) {
+ if (mob == target) return; // DivineMC - Fix MC-110386
mob.setTarget(target, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_ATTACKED_NEARBY_ENTITY); // CraftBukkit - reason
}
}

19
divinemc-server/minecraft-patches/features/0028-lithium-skip-useless-secondary-poi-sensor.patch → divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java.patch
View File

@@ -1,23 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 02:26:11 +0300
Subject: [PATCH] lithium: skip useless secondary poi sensor
This patch is based on the following mixin:
"net/caffeinemc/mods/lithium/mixin/ai/sensor/secondary_poi/SecondaryPoiSensorMixin.java"
By: 2No2Name <2No2Name@web.de>
As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
Lithium description:
villagers that have no secondary POI (farmland) do not search for it
diff --git a/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java b/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
index dc4a9ddb8479e9d0c4895b19d7d677cdd8ad3faa..c3911232667ae9e1f70397f6ff5e7608694248fa 100644
--- a/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
+++ b/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
@@ -22,6 +22,12 @@ public class SecondaryPoiSensor extends Sensor<Villager> {
@@ -22,6 +_,12 @@
@Override
protected void doTick(ServerLevel level, Villager entity) {

11
divinemc-server/minecraft-patches/features/0020-Fix-MC-200418.patch → divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombieVillager.java.patch
View File

@@ -1,15 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 02:02:47 +0300
Subject: [PATCH] Fix MC-200418
Issue on Mojira: https://bugs.mojang.com/browse/MC/issues/MC-200418
diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java
index e218e5d5f146ec996a6f5ce7e76b1d6506ac1cb9..00af89717bf2459b315baf70a515a0e68267fb9f 100644
--- a/net/minecraft/world/entity/monster/ZombieVillager.java
+++ b/net/minecraft/world/entity/monster/ZombieVillager.java
@@ -292,6 +292,12 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -292,6 +_,12 @@
if (!this.isSilent()) {
level.levelEvent(null, 1027, this.blockPosition(), 0);
}

14
divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch Normal file
View File

@@ -0,0 +1,14 @@
--- a/net/minecraft/world/entity/player/Player.java
+++ b/net/minecraft/world/entity/player/Player.java
@@ -1817,6 +_,11 @@
}
public void causeFoodExhaustion(float exhaustion, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason reason) {
+ // DivineMC start - Fix MC-31819
+ if (this.level().getDifficulty() == Difficulty.PEACEFUL) {
+ return;
+ }
+ // DivineMC end - Fix MC-31819
// CraftBukkit end
if (!this.abilities.invulnerable) {
if (!this.level().isClientSide) {

15
divinemc-server/minecraft-patches/features/0030-VMP-store-mob-counts-in-an-array.patch → divinemc-server/minecraft-patches/sources/net/minecraft/world/level/LocalMobCapCalculator.java.patch
View File

@@ -1,19 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 02:33:29 +0300
Subject: [PATCH] VMP: store mob counts in an array
This patch is based on the following mixin:
"com/ishland/vmp/mixins/general/spawn_density_cap/MixinSpawnDensityCapperDensityCap.java"
By: ishland <ishlandmc@yeah.net>
As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/net/minecraft/world/level/LocalMobCapCalculator.java b/net/minecraft/world/level/LocalMobCapCalculator.java
index 9641219c190261dea0db5f95f040a705ba0a3ff9..d9fe183dbf072f82afae63792967d6e7953d7151 100644
--- a/net/minecraft/world/level/LocalMobCapCalculator.java
+++ b/net/minecraft/world/level/LocalMobCapCalculator.java
@@ -42,14 +42,14 @@ public class LocalMobCapCalculator {
@@ -42,14 +_,14 @@
}
static class MobCounts {

11
divinemc-server/minecraft-patches/features/0023-Fix-MC-258859.patch → divinemc-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/SurfaceRules.java.patch
View File

@@ -1,15 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 6 Jul 2025 02:08:04 +0300
Subject: [PATCH] Fix MC-258859
Issue on Mojira: https://bugs.mojang.com/browse/MC/issues/MC-258859
diff --git a/net/minecraft/world/level/levelgen/SurfaceRules.java b/net/minecraft/world/level/levelgen/SurfaceRules.java
index 0948c8db90605a15a043b5c5bc74edecd7f9db1b..32757c6847cf77862a2f1b38cc53e7166e6be492 100644
--- a/net/minecraft/world/level/levelgen/SurfaceRules.java
+++ b/net/minecraft/world/level/levelgen/SurfaceRules.java
@@ -397,6 +397,22 @@ public class SurfaceRules {
@@ -397,6 +_,22 @@
@Override
protected boolean compute() {

11
divinemc-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/feature/OreFeature.java.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/net/minecraft/world/level/levelgen/feature/OreFeature.java
+++ b/net/minecraft/world/level/levelgen/feature/OreFeature.java
@@ -69,7 +_,7 @@
int height
) {
int i = 0;
- BitSet bitSet = new BitSet(width * height * width);
+ BitSet bitSet = org.bxteam.divinemc.util.cache.CachedOrNewBitsGetter.getCachedOrNewBitSet(width * height * width); // DivineMC - C2ME: Reduce Allocations
BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
int i1 = config.size;
double[] doubles = new double[i1 * 4];

6
divinemc-server/paper-patches/features/0003-Delete-timings.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Delete timings
diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
index 7ce9ebba8ce304d1f3f21d4f15ee5f3560d7700b..11e5b9ebafa562e5a93643d954839e86d0b731f0 100644
index e989053b703fddfbffc3e4ed9381594aaaa0df41..d7398b1ecf2660c29fb7d106b48fe02d3736603e 100644
--- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
+++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
@@ -1,6 +1,5 @@
@@ -15,7 +15,7 @@ index 7ce9ebba8ce304d1f3f21d4f15ee5f3560d7700b..11e5b9ebafa562e5a93643d954839e86
import com.destroystokyo.paper.event.server.ServerExceptionEvent;
import com.destroystokyo.paper.exception.ServerEventException;
import com.google.common.collect.Sets;
@@ -95,7 +94,6 @@ class PaperEventManager {
@@ -96,7 +95,6 @@ class PaperEventManager {
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}
@@ -23,7 +23,7 @@ index 7ce9ebba8ce304d1f3f21d4f15ee5f3560d7700b..11e5b9ebafa562e5a93643d954839e86
this.getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
}
@@ -182,7 +180,7 @@ class PaperEventManager {
@@ -183,7 +181,7 @@ class PaperEventManager {
}
}

0
divinemc-server/paper-patches/features/0015-Virtual-Threads.patch → divinemc-server/paper-patches/features/0012-Virtual-Threads.patch
View File

0
divinemc-server/paper-patches/features/0016-Implement-Secure-Seed.patch → divinemc-server/paper-patches/features/0013-Implement-Secure-Seed.patch
View File

Some files were not shown because too many files have changed in this diff Show More