Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-21 15:59:33 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2024-05-27 14:31:44 +08:00
parent e8b229b6d9
commit dafcfafab6
33 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -3,6 +3,6 @@ version=1.20.6-R0.1-SNAPSHOT
mcVersion=1.20.6
org.gradle.jvmargs=-Xmx2G
paperRef=377733d44c0f1d476cada93ebae2478a1c495b23
paperRef=347bbe389786d5cdae7cd1c6ec32cacba2a9aac7
preVersion=true
updatingMinecraft=true

14
patches/server/0003-Delete-Timings.patch
View File

@@ -1588,7 +1588,7 @@ index a46bf73c608641bf1f00fd55242de71a0f2ee06e..9b15a2a966de203ada8894a9354ff8e0
return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS;
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index ef0f118aecf0893e45cb9423a677d7e42496324b..13b4f4dd74a639856aa89e131f44d973e12c027c 100644
index 0ddf2e1a6d2ea836f8a140a435721e0ce96bd8d2..638e539cd572a76ec280e7ea7866d2d9b5e78ddd 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -150,7 +150,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -1675,10 +1675,10 @@ index 85b4b24361e785acf75571ff98f924c00ae80748..1f3e0392f88a7cb3fb5c0767cdd1b4bc
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 0a8eeebb2d702ebcefd9f26cc0f41d1eab497902..7231aaac1fe66301727502596f59f9af71cf0aa6 100644
index 14281a4e72f49dc4eb2ca3da8479c1f81a3a175d..6a1adbc426a8c79c3fefc5a17509d9097ac9f3db 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -170,7 +170,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -171,7 +171,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
// Paper end - add paper world config
public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
@@ -1686,7 +1686,7 @@ index 0a8eeebb2d702ebcefd9f26cc0f41d1eab497902..7231aaac1fe66301727502596f59f9af
public static BlockPos lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
private org.spigotmc.TickLimiter tileLimiter;
@@ -283,7 +282,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -284,7 +283,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public void onBorderSetDamageSafeZOne(WorldBorder border, double safeZoneRadius) {}
});
// CraftBukkit end
@@ -1694,7 +1694,7 @@ index 0a8eeebb2d702ebcefd9f26cc0f41d1eab497902..7231aaac1fe66301727502596f59f9af
this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime);
this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
@@ -1251,15 +1249,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1252,15 +1250,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
ProfilerFiller gameprofilerfiller = this.getProfiler();
gameprofilerfiller.push("blockEntities");
@@ -1710,7 +1710,7 @@ index 0a8eeebb2d702ebcefd9f26cc0f41d1eab497902..7231aaac1fe66301727502596f59f9af
// Spigot start
// Iterator<TickingBlockEntity> iterator = this.blockEntityTickers.iterator();
boolean flag = this.tickRateManager().runsNormally();
@@ -1288,9 +1283,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1289,9 +1284,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075
@@ -1778,7 +1778,7 @@ index 6349f2e0a5ba30d250f5ffe43771f325c0999a76..f6935dc39b878b2463a8c3febc1f0da4
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
public CraftPersistentDataContainer persistentDataContainer;
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 2a8609e33716949ff1877b6d10f64a9d7a7c81e9..96490c90697ad42565c465a5ed1d956fc1c73f73 100644
index 14ee7b5b9b804bebd4e2a846b238547a28a36035..33673bde99023af6a136270091959cca69f514fb 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -785,7 +785,6 @@ public class LevelChunk extends ChunkAccess {

10
patches/server/0004-Leaves-Server-Utils.patch
View File

@@ -31,10 +31,10 @@ index 46954db7ecd35ac4018fdf476df7c8020d7ce6c8..044c51ebb058fc36074fd178929e3279
public PlayerAreaMap() {
super();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 25ea45a528612d1a2a2d77293b3802f473a52f38..5d14db0ee37c2705630776bd135bbc1e0d150905 100644
index 4ee843dfd826772c9157ca421d8fe1f36f814b51..7d6c126fe9d158fbda7dc09966e8acc59537f944 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -426,6 +426,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -425,6 +425,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
private UUID originWorld;
public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
public boolean fixedPose = false; // Paper - Expand Pose API
@@ -42,7 +42,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..5d14db0ee37c2705630776bd135bbc1e
public void setOrigin(@javax.annotation.Nonnull Location location) {
this.origin = location.toVector();
@@ -2555,6 +2556,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -2554,6 +2555,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
nbttagcompound.putBoolean("Paper.FreezeLock", true);
}
// Paper end
@@ -50,7 +50,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..5d14db0ee37c2705630776bd135bbc1e
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -2702,6 +2704,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -2701,6 +2703,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
freezeLocked = nbt.getBoolean("Paper.FreezeLock");
}
// Paper end
@@ -62,7 +62,7 @@ index 25ea45a528612d1a2a2d77293b3802f473a52f38..5d14db0ee37c2705630776bd135bbc1e
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
@@ -5001,4 +5008,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -5000,4 +5007,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end - Expose entity id counter

8
patches/server/0008-Fix-gravity-block-duper.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix gravity block duper
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 5d14db0ee37c2705630776bd135bbc1e0d150905..25cfcde7eeb80d3e5ab530096b8ae947412ee282 100644
index 7d6c126fe9d158fbda7dc09966e8acc59537f944..5c4c503181c3dee9d7b16da716f4ba5d6a446521 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -443,6 +443,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -442,6 +442,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return this.originWorld;
}
// Paper end - Entity origin API
@@ -16,7 +16,7 @@ index 5d14db0ee37c2705630776bd135bbc1e0d150905..25cfcde7eeb80d3e5ab530096b8ae947
// Paper start - make end portalling safe
public BlockPos portalBlock;
public ServerLevel portalWorld;
@@ -473,6 +474,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -472,6 +473,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.teleportTo(worldserver, null);
}
// Paper end - make end portalling safe
@@ -24,7 +24,7 @@ index 5d14db0ee37c2705630776bd135bbc1e0d150905..25cfcde7eeb80d3e5ab530096b8ae947
// Paper start - optimise entity tracking
final org.spigotmc.TrackingRange.TrackingRangeType trackingRangeType = org.spigotmc.TrackingRange.getTrackingRangeType(this);
@@ -3266,7 +3268,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3265,7 +3267,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
this.processPortalCooldown();

16
patches/server/0011-Fakeplayer-support.patch
View File

@@ -108,7 +108,7 @@ index dc20b051d4f14ce4e0b5a0114e02d15716a7c3d6..d1a42800e069fa89d3f3fb4dcb9948d1
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index a645ad66af061966c5e47cae677026b35a55c486..1adceb1122a3312d70482e01f9d3054b3b88ba5d 100644
index 6a4637eef14cbd84bbe26ef16f004b8f93367a3d..1b64253c30d1528f7401f15eaa336bbf183dc9d2 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -194,6 +194,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -128,7 +128,7 @@ index a645ad66af061966c5e47cae677026b35a55c486..1adceb1122a3312d70482e01f9d3054b
private final PlayerAdvancements advancements;
private final ServerStatsCounter stats;
private float lastRecordedHealthAndAbsorption = Float.MIN_VALUE;
@@ -779,16 +780,20 @@ public class ServerPlayer extends Player {
@@ -780,16 +781,20 @@ public class ServerPlayer extends Player {
--this.invulnerableTime;
}
@@ -158,7 +158,7 @@ index a645ad66af061966c5e47cae677026b35a55c486..1adceb1122a3312d70482e01f9d3054b
Entity entity = this.getCamera();
@@ -804,7 +809,7 @@ public class ServerPlayer extends Player {
@@ -805,7 +810,7 @@ public class ServerPlayer extends Player {
}
}
@@ -167,7 +167,7 @@ index a645ad66af061966c5e47cae677026b35a55c486..1adceb1122a3312d70482e01f9d3054b
if (this.levitationStartPos != null) {
CriteriaTriggers.LEVITATION.trigger(this, this.levitationStartPos, this.tickCount - this.levitationStartTime);
}
@@ -1024,7 +1029,7 @@ public class ServerPlayer extends Player {
@@ -1025,7 +1030,7 @@ public class ServerPlayer extends Player {
List<DefaultDrop> loot = new java.util.ArrayList<>(this.getInventory().getContainerSize()); // Paper - Restore vanilla drops behavior
boolean keepInventory = this.level().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) || this.isSpectator();
@@ -176,7 +176,7 @@ index a645ad66af061966c5e47cae677026b35a55c486..1adceb1122a3312d70482e01f9d3054b
for (ItemStack item : this.getInventory().getContents()) {
if (!item.isEmpty() && !EnchantmentHelper.hasVanishingCurse(item)) {
loot.add(new DefaultDrop(item, stack -> this.drop(stack, true, false, false))); // Paper - Restore vanilla drops behavior; drop function taken from Inventory#dropAll (don't fire drop event)
@@ -1349,6 +1354,13 @@ public class ServerPlayer extends Player {
@@ -1350,6 +1355,13 @@ public class ServerPlayer extends Player {
this.lastSentHealth = -1.0F;
this.lastSentFood = -1;
@@ -275,10 +275,10 @@ index 11d73647d2d94c8131c5e3eeef490fb3472fe0a4..ef719bf410912b24d57de422d1fa3fb2
+ // Leaves end - fakeplayer support
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 25cfcde7eeb80d3e5ab530096b8ae947412ee282..28d388d5955eeb322b9f47ba542a23ca2264ea8e 100644
index 5c4c503181c3dee9d7b16da716f4ba5d6a446521..f77cfb2099ab59f63a8c79aa18ad9008585f5939 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1511,7 +1511,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1510,7 +1510,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return offsetFactor;
}
@@ -288,7 +288,7 @@ index 25cfcde7eeb80d3e5ab530096b8ae947412ee282..28d388d5955eeb322b9f47ba542a23ca
final boolean xZero = movement.x == 0.0;
final boolean yZero = movement.y == 0.0;
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
index 35299affb699d745804a3b60cb78b9323f3e068e..f959f1819181b867dfabd19005e730069dffda4d 100644
index 882de08963c72614a3d26cd917916e42b7136042..e32bf7060285b5da72f5d6c5e2449d4319c856d5 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
@@ -62,7 +62,7 @@ public class FishingHook extends Projectile {

2
patches/server/0014-Add-isShrink-to-EntityResurrectEvent.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add isShrink to EntityResurrectEvent
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 13b4f4dd74a639856aa89e131f44d973e12c027c..b7fbb6b7fddee11ceffbce9c1f2de869176351be 100644
index 638e539cd572a76ec280e7ea7866d2d9b5e78ddd..6324dc5f79ed6592b80b5e8d425cef74249b33ef 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1648,12 +1648,12 @@ public abstract class LivingEntity extends Entity implements Attackable {

2
patches/server/0020-Dont-send-useless-entity-packets.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Dont send useless entity packets
This patch is Powered by Purpur(https://github.com/PurpurMC/Purpur)
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index f16a69775332a08ed0e87d27acd0fc959359694c..770c51528e5a31e2738fbce5d63d2ea3f11186f8 100644
index a2279262c93408c11f5d2290b48fd794975e8cfe..6177fd5c7e1719a1618388f55b8510d8984a5bf2 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -204,6 +204,7 @@ public class ServerEntity {

4
patches/server/0021-Optimize-entity-coordinate-key.patch
View File

@@ -25,10 +25,10 @@ index 1d6b3fe2ce240af4ede61588795456b046eee6c9..21847dfde06ded5944699ca30a4ec9c2
public static long getCoordinateKey(final ChunkPos pair) {
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 28d388d5955eeb322b9f47ba542a23ca2264ea8e..b4349e91a804c7998bb42f3a1e228f56ab2a5d0f 100644
index f77cfb2099ab59f63a8c79aa18ad9008585f5939..9f4ebfb9afb0b49b56c48badae2846188bcf6bd1 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -312,7 +312,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -311,7 +311,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
public double yo;
public double zo;
private Vec3 position;

2
patches/server/0022-Optimize-suffocation.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize suffocation
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index b7fbb6b7fddee11ceffbce9c1f2de869176351be..407514daeb977d44d9f82dc5865cfd757f8ef40e 100644
index 6324dc5f79ed6592b80b5e8d425cef74249b33ef..706dfaa36b192beb5ba3c3e48fdbac5091d3d161 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -426,7 +426,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

6
patches/server/0024-Move-ThreadUnsafeRandom-Initialization.patch
View File

@@ -19,10 +19,10 @@ index c93d0fbb921309a63c21ba7775fdf44aaa7985c4..84472442e0e68c22c4ebeaaf980aee1e
public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 7231aaac1fe66301727502596f59f9af71cf0aa6..2f12ea930fb173b22d36dc159ee3730fb61f2f08 100644
index 6a1adbc426a8c79c3fefc5a17509d9097ac9f3db..f7823ed9b293b040e38c517d6b96789c7ebba276 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -203,6 +203,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -204,6 +204,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public abstract ResourceKey<LevelStem> getTypeKey();
@@ -31,7 +31,7 @@ index 7231aaac1fe66301727502596f59f9af71cf0aa6..2f12ea930fb173b22d36dc159ee3730f
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config; Async-Anti-Xray: Pass executor
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
@@ -291,6 +293,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -292,6 +294,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
// Paper end - optimise collisions
}

2
patches/server/0025-Optimize-random-calls-in-chunk-ticking.patch
View File

@@ -49,7 +49,7 @@ index 84472442e0e68c22c4ebeaaf980aee1e8a234d81..38fcba055839fc1b5522e8a88bdaa63d
if (this.isRainingAt(blockposition)) {
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 96490c90697ad42565c465a5ed1d956fc1c73f73..8b4f58dae2dba4c661dbd3de0ef65cdbf3bb861e 100644
index 33673bde99023af6a136270091959cca69f514fb..f94ca04e55e02f2d8fcb98ad1868319d55da7468 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -88,6 +88,18 @@ public class LevelChunk extends ChunkAccess {

4
patches/server/0028-Config-to-disable-method-profiler.patch
View File

@@ -22,10 +22,10 @@ index 24362501292e61c5d1f17917f27095b6a56b661c..ee22bcbe2f64cac2d22328d9abb3c91c
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 2f12ea930fb173b22d36dc159ee3730fb61f2f08..fe8886afe34f978b34832b5b295c7fee8bef3c26 100644
index f7823ed9b293b040e38c517d6b96789c7ebba276..db64aef6cd6bc961c2b69853cb2f5a86a044d49d 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1781,6 +1781,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1782,6 +1782,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public ProfilerFiller getProfiler() {

2
patches/server/0029-Throttle-goal-selector-during-inactive-ticking.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Throttle goal selector during inactive ticking
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index a80f313771575c1f772d23ef2469a2dce7b1688c..18a7b57a7e45fc9c412c5b203d686e896ddddd06 100644
index 9f42563699508fcb3d8a96cfdfc25a7bffd99759..331a7c54c7872fe281b1f494a2d3f57a8e71bbb5 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -237,11 +237,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti

2
patches/server/0034-Cache-climbing-check-for-activation.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Cache climbing check for activation
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 407514daeb977d44d9f82dc5865cfd757f8ef40e..0bd50e9ced73d121a1856f910a807b470534a272 100644
index 706dfaa36b192beb5ba3c3e48fdbac5091d3d161..7d52e1d666b0df0a6a99930fe6762ecaf6cc33fe 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2058,6 +2058,22 @@ public abstract class LivingEntity extends Entity implements Attackable {

6
patches/server/0036-Reduce-entity-fluid-lookups-if-no-fluids.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Reduce entity fluid lookups if no fluids
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index b4349e91a804c7998bb42f3a1e228f56ab2a5d0f..af5e5170db5c4f4ee9fa36a92937789be0554a54 100644
index 9f4ebfb9afb0b49b56c48badae2846188bcf6bd1..167b931ba2961fa27a370bf114cba22139bf9170 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4493,16 +4493,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4492,16 +4492,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -35,7 +35,7 @@ index b4349e91a804c7998bb42f3a1e228f56ab2a5d0f..af5e5170db5c4f4ee9fa36a92937789b
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4510,38 +4512,123 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4509,38 +4511,123 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();

4
patches/server/0040-InstantBlockUpdater-Reintroduced.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] InstantBlockUpdater Reintroduced
This patch is Powered by Carpet-TIS-Addition(https://github.com/plusls/Carpet-TIS-Addition)
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index fe8886afe34f978b34832b5b295c7fee8bef3c26..fc956d2d81f9b7625c7143810c77c8ab8e86ec5c 100644
index db64aef6cd6bc961c2b69853cb2f5a86a044d49d..099617d8aefc9b9f1bbcf2810af64b8152822291 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -73,6 +73,7 @@ import net.minecraft.world.level.lighting.LevelLightEngine;
@@ -17,7 +17,7 @@ index fe8886afe34f978b34832b5b295c7fee8bef3c26..fc956d2d81f9b7625c7143810c77c8ab
import net.minecraft.world.level.redstone.NeighborUpdater;
import net.minecraft.world.level.saveddata.maps.MapId;
import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
@@ -245,7 +246,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -246,7 +247,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
this.thread = Thread.currentThread();
this.biomeManager = new BiomeManager(this, i);
this.isDebug = flag1;

8
patches/server/0044-Player-operation-limiter.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Player operation limiter
This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 1adceb1122a3312d70482e01f9d3054b3b88ba5d..8fca15c38d3410b0db113b2a391fd1d3f5596aee 100644
index 1b64253c30d1528f7401f15eaa336bbf183dc9d2..e74084548930664d4795d10a3f3448877128c88f 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -299,6 +299,10 @@ public class ServerPlayer extends Player {
@@ -20,7 +20,7 @@ index 1adceb1122a3312d70482e01f9d3054b3b88ba5d..8fca15c38d3410b0db113b2a391fd1d3
// Paper start - replace player chunk loader
private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
@@ -773,6 +777,7 @@ public class ServerPlayer extends Player {
@@ -774,6 +778,7 @@ public class ServerPlayer extends Player {
this.joining = false;
}
// CraftBukkit end
@@ -28,7 +28,7 @@ index 1adceb1122a3312d70482e01f9d3054b3b88ba5d..8fca15c38d3410b0db113b2a391fd1d3
this.gameMode.tick();
this.wardenSpawnTracker.tick();
--this.spawnInvulnerableTime;
@@ -2882,5 +2887,32 @@ public class ServerPlayer extends Player {
@@ -2883,5 +2888,32 @@ public class ServerPlayer extends Player {
public CraftPlayer getBukkitEntity() {
return (CraftPlayer) super.getBukkitEntity();
}
@@ -62,7 +62,7 @@ index 1adceb1122a3312d70482e01f9d3054b3b88ba5d..8fca15c38d3410b0db113b2a391fd1d3
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index 5cedce1f432f6b809b25269242a16477682c824f..3c729ffe8366e6550cfa03da2d986030fbbff02e 100644
index 1047027610624c9ba4bb5afd5d7f0714a062b198..2afa036e7dcd52ec71b62cd0e30ce1b539459c55 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -43,6 +43,7 @@ import org.bukkit.event.Event;

2
patches/server/0046-Stackable-ShulkerBoxes.patch
View File

@@ -207,7 +207,7 @@ index c39c773112fb8b534b926f2f2b47fe6fbb69fcb2..ae9338b8a5598e7a257b469adae72858
@Nullable
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 893efb2c4a07c33d41e934279dd914a9dbd4ef79..364e8ed48512dd499bf393947fd7a954c22acc0e 100644
index 58c38bc4361ddf24716f326b0c6fc626d434756e..600f9d29e5b81a69a0f3a97ec93b37ad4f72b51c 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -228,7 +228,7 @@ public final class ItemStack implements DataComponentHolder {

4
patches/server/0048-MC-Technical-Survival-Mode.patch
View File

@@ -65,10 +65,10 @@ index 63652c3011c48c461c1b5be1889847b2f065e34c..0f3a92155fa0b4ed9d7fbc87202fd04d
pearl.ownerUUID = null;
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 8fca15c38d3410b0db113b2a391fd1d3f5596aee..a3c3e3848a2528aea1ff379b348cf07fb4e7c07b 100644
index e74084548930664d4795d10a3f3448877128c88f..05ee5e0bcefc25b771eac20e53a7b7a3e0fed944 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1610,7 +1610,7 @@ public class ServerPlayer extends Player {
@@ -1611,7 +1611,7 @@ public class ServerPlayer extends Player {
@Override
public boolean isInvulnerableTo(DamageSource damageSource) {

8
patches/server/0049-Return-nether-portal-fix.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Return nether portal fix
This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index a3c3e3848a2528aea1ff379b348cf07fb4e7c07b..74667f23c21e983359c0630812a46d98934a13c9 100644
index 05ee5e0bcefc25b771eac20e53a7b7a3e0fed944..622e19594039b7fd0841221664c27426b10768cd 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -19,6 +19,7 @@ import java.util.UUID;
@@ -17,7 +17,7 @@ index a3c3e3848a2528aea1ff379b348cf07fb4e7c07b..74667f23c21e983359c0630812a46d98
import net.minecraft.ChatFormatting;
import net.minecraft.CrashReport;
import net.minecraft.CrashReportCategory;
@@ -1370,6 +1371,24 @@ public class ServerPlayer extends Player {
@@ -1371,6 +1372,24 @@ public class ServerPlayer extends Player {
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
// CraftBukkit end
@@ -42,7 +42,7 @@ index a3c3e3848a2528aea1ff379b348cf07fb4e7c07b..74667f23c21e983359c0630812a46d98
}
// Paper start - Reset shield blocking on dimension change
if (this.isBlocking()) {
@@ -1422,6 +1441,30 @@ public class ServerPlayer extends Player {
@@ -1423,6 +1442,30 @@ public class ServerPlayer extends Player {
protected Optional<BlockUtil.FoundRectangle> getExitPortal(ServerLevel worldserver, BlockPos blockposition, boolean flag, WorldBorder worldborder, int searchRadius, boolean canCreatePortal, int createRadius) { // CraftBukkit
Optional<BlockUtil.FoundRectangle> optional = super.getExitPortal(worldserver, blockposition, flag, worldborder, searchRadius, canCreatePortal, createRadius); // CraftBukkit
@@ -111,7 +111,7 @@ index 00809b615f65b2f4985856673430d8ba68525765..a65aede101004f23f76ce08781ab0a94
// Save player file again if they were disconnected
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 0bd50e9ced73d121a1856f910a807b470534a272..f1a989919f563b3f424d3ba7ebecb10ac56c4ecb 100644
index 7d52e1d666b0df0a6a99930fe6762ecaf6cc33fe..23bc4918f58a205d1e0f29f39e9fa9463b0254e6 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -251,7 +251,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

4
patches/server/0053-Use-vanilla-random-config.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Use vanilla random config
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index af5e5170db5c4f4ee9fa36a92937789be0554a54..0585b355d55d8828c4309ffe6b160ee8777f4804 100644
index 167b931ba2961fa27a370bf114cba22139bf9170..a96d466acc6823a6c876473d7d28b9e1cc79311f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -580,7 +580,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -579,7 +579,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.bb = Entity.INITIAL_AABB;
this.stuckSpeedMultiplier = Vec3.ZERO;
this.nextStep = 1.0F;

2
patches/server/0058-Disable-distance-check-for-UseItemOnPacket.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable distance check for UseItemOnPacket
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index b9b3277c8ed94e0cd30b20b9c00a33eaad48e5ac..21a3e948ee82605bb970e8503be57b0e66373f77 100644
index c450447585af4c8cdc87abe871c229ff895c3e53..04580447902df75be4862e6da558e2fe1d12913e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1920,7 +1920,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

8
patches/server/0070-Elytra-aeronautics-no-chunk-load.patch
View File

@@ -45,7 +45,7 @@ index da65f980f2145ea03341911ce75f7e61b358c9d7..7dcdc9b40c594234d87bef3e75a68dda
SectionPos sectionposition = player.getLastSectionPos();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 21a3e948ee82605bb970e8503be57b0e66373f77..1005e1c4c86f707c3e55ef3c5325dd76bf885ef0 100644
index 04580447902df75be4862e6da558e2fe1d12913e..1c8a982f747e2ebc3cd13a28dec66e84050c822e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -556,7 +556,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -58,10 +58,10 @@ index 21a3e948ee82605bb970e8503be57b0e66373f77..1005e1c4c86f707c3e55ef3c5325dd76
!worldserver.areChunksLoadedForMove(entity.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(entity.position())))
)) {
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 0585b355d55d8828c4309ffe6b160ee8777f4804..36e6a9db495585b116782ece080e45979272f666 100644
index a96d466acc6823a6c876473d7d28b9e1cc79311f..4238b6cc9d59ad392e8f67580a4be59bc028935f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1157,7 +1157,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1156,7 +1156,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return;
}
}
@@ -76,7 +76,7 @@ index 0585b355d55d8828c4309ffe6b160ee8777f4804..36e6a9db495585b116782ece080e4597
this.level().getProfiler().push("move");
if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
movement = movement.multiply(this.stuckSpeedMultiplier);
@@ -2105,6 +2111,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -2104,6 +2110,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.yo = y;
this.zo = d4;
this.setPos(d3, y, d4);

6
patches/server/0073-No-block-update-command.patch
View File

@@ -17,10 +17,10 @@ index 0f3a92155fa0b4ed9d7fbc87202fd04dc01a0890..3bb53128f6919712f0a88ec11c1bce25
// CraftBukkit start
if (this.populating) {
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 364e8ed48512dd499bf393947fd7a954c22acc0e..cb5effe8be9f43ef6b3fa48c25600cdcd69ddc9e 100644
index 600f9d29e5b81a69a0f3a97ec93b37ad4f72b51c..f33088fa895e36dcaf6e96c52aacd5545b657a5a 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -504,7 +504,7 @@ public final class ItemStack implements DataComponentHolder {
@@ -506,7 +506,7 @@ public final class ItemStack implements DataComponentHolder {
net.minecraft.world.level.block.state.BlockState block = world.getBlockState(newblockposition);
if (!(block.getBlock() instanceof BaseEntityBlock)) { // Containers get placed automatically
@@ -30,7 +30,7 @@ index 364e8ed48512dd499bf393947fd7a954c22acc0e..cb5effe8be9f43ef6b3fa48c25600cdc
world.notifyAndUpdatePhysics(newblockposition, null, oldBlock, block, world.getBlockState(newblockposition), updateFlag, 512); // send null chunk as chunk.k() returns false by this point
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 8b4f58dae2dba4c661dbd3de0ef65cdbf3bb861e..2b8bbb6bdb636457796029120960a7e6f98d46e7 100644
index f94ca04e55e02f2d8fcb98ad1868319d55da7468..11fadf105e59b4cddc8c4fa4f02b1ce69abfc7c7 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -481,7 +481,7 @@ public class LevelChunk extends ChunkAccess {

16
patches/server/0089-Reduce-array-allocations.patch
View File

@@ -214,7 +214,7 @@ index 53c23d5bbbc5c74a35dafec99bcf13f9fa7552ac..f1632e343eeb9cc6680ec9bddacddf78
public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index 770c51528e5a31e2738fbce5d63d2ea3f11186f8..c6cd4bed3829b715a42cc51ab9da1385f9eec932 100644
index 6177fd5c7e1719a1618388f55b8510d8984a5bf2..04c4f86b63f479821f5757e790808440121f13bc 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -369,7 +369,7 @@ public class ServerEntity {
@@ -257,7 +257,7 @@ index 3bb53128f6919712f0a88ec11c1bce25bf5b8b84..8593af5223c1e8de3684cb89957835dd
return ret;
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 1005e1c4c86f707c3e55ef3c5325dd76bf885ef0..ca22905fa9948f85dcace5098ffd9807d338c93c 100644
index 1c8a982f747e2ebc3cd13a28dec66e84050c822e..5ba41f7c9fd6526f71180ad8d1c3d7b443c5e2f2 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -249,6 +249,7 @@ import org.bukkit.inventory.EquipmentSlot;
@@ -375,7 +375,7 @@ index eb3c12e03c0d5c9cec84d97e2c51c50ce59c23a4..0593d76c67f4475d624c5289b65c5d4a
private EquipmentSlot(final EquipmentSlot.Type type, final int entityId, final int armorStandId, final String name) {
this.type = type;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index f1a989919f563b3f424d3ba7ebecb10ac56c4ecb..f8187085df596c296d92ff43a1f02fed3732437c 100644
index 23bc4918f58a205d1e0f29f39e9fa9463b0254e6..6247ad2cc18a4615859187db54f374a83bf2d50b 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3238,7 +3238,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -388,7 +388,7 @@ index f1a989919f563b3f424d3ba7ebecb10ac56c4ecb..f8187085df596c296d92ff43a1f02fed
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 18a7b57a7e45fc9c412c5b203d686e896ddddd06..4486a84b10c20515f18efce522e58c92a9591b65 100644
index 331a7c54c7872fe281b1f494a2d3f57a8e71bbb5..200be7104a26e572e26059c93f9076a1f31cfc05 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1201,7 +1201,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
@@ -441,10 +441,10 @@ index f38acc96f71298e40ce9433e7759fd223ca55e48..03652ec451109d2026fc313f143d78d4
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index cb5effe8be9f43ef6b3fa48c25600cdcd69ddc9e..98c6c0b5e795558fc9d1b96643832b3c4b92740a 100644
index f33088fa895e36dcaf6e96c52aacd5545b657a5a..6e717e2fd606514c8e114babcb083393e00e5fb6 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -1102,7 +1102,7 @@ public final class ItemStack implements DataComponentHolder {
@@ -1104,7 +1104,7 @@ public final class ItemStack implements DataComponentHolder {
ItemAttributeModifiers itemattributemodifiers = (ItemAttributeModifiers) this.getOrDefault(DataComponents.ATTRIBUTE_MODIFIERS, ItemAttributeModifiers.EMPTY);
if (itemattributemodifiers.showInTooltip()) {
@@ -496,7 +496,7 @@ index e158ff1a9dbd054985873e854fcf6c433102059c..e061322fed6adf49a506ea13db50cdf2
private static Enchantment register(String name, Enchantment enchantment) {
return Registry.register(BuiltInRegistries.ENCHANTMENT, name, enchantment);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index fc956d2d81f9b7625c7143810c77c8ab8e86ec5c..c7f740be91ecbf9cb3baa30ae02b5751454fc23d 100644
index 099617d8aefc9b9f1bbcf2810af64b8152822291..ac9647b7232a860b87c0a15aa7971e243d311152 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -101,6 +101,7 @@ import org.bukkit.craftbukkit.util.CraftSpawnCategory;
@@ -507,7 +507,7 @@ index fc956d2d81f9b7625c7143810c77c8ab8e86ec5c..c7f740be91ecbf9cb3baa30ae02b5751
public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1859,7 +1860,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1860,7 +1861,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public org.bukkit.entity.Entity[] getChunkEntities(int chunkX, int chunkZ) {
io.papermc.paper.world.ChunkEntitySlices slices = ((ServerLevel)this).getEntityLookup().getChunk(chunkX, chunkZ);
if (slices == null) {

6
patches/server/0090-Optimize-sun-burn-tick.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize sun burn tick
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 36e6a9db495585b116782ece080e45979272f666..658a3dfa4959589ac1e5b5c9b6a96f1522574daa 100644
index 4238b6cc9d59ad392e8f67580a4be59bc028935f..1272a2c18c6d89546b33ed777abe90b7184dff64 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2091,8 +2091,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -2090,8 +2090,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
/** @deprecated */
@Deprecated
public float getLightLevelDependentMagicValue() {
@@ -34,7 +34,7 @@ index 36e6a9db495585b116782ece080e45979272f666..658a3dfa4959589ac1e5b5c9b6a96f15
public void absMoveTo(double x, double y, double z, float yaw, float pitch) {
this.absMoveTo(x, y, z);
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 4486a84b10c20515f18efce522e58c92a9591b65..339ac20d409f71307a79c562edd7f9cf927e794f 100644
index 200be7104a26e572e26059c93f9076a1f31cfc05..48f67db5bfebfff4dab4607b2435f5e01edf8d03 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1845,15 +1845,41 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti

2
patches/server/0094-Check-frozen-ticks-before-landing-block.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Check frozen ticks before landing block
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index f8187085df596c296d92ff43a1f02fed3732437c..d053eeebfee81c4dc8a6b42e50d7cf76aad39fbe 100644
index 6247ad2cc18a4615859187db54f374a83bf2d50b..75d9ad305b156a1f61fdd0fbed0671b13759d14c 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -593,11 +593,11 @@ public abstract class LivingEntity extends Entity implements Attackable {

8
patches/server/0095-Skip-entity-move-if-movement-is-zero.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Skip entity move if movement is zero
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 658a3dfa4959589ac1e5b5c9b6a96f1522574daa..0e319cf3782137114ed3b60ccc7c3d25ab109a64 100644
index 1272a2c18c6d89546b33ed777abe90b7184dff64..0e284a81464e6f2ffc73177fa289168e372c4265 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -320,6 +320,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -319,6 +319,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
public float yRotO;
public float xRotO;
private AABB bb;
@@ -17,7 +17,7 @@ index 658a3dfa4959589ac1e5b5c9b6a96f1522574daa..0e319cf3782137114ed3b60ccc7c3d25
public boolean onGround;
public boolean horizontalCollision;
public boolean verticalCollision;
@@ -1134,6 +1135,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1133,6 +1134,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// Paper end - detailed watchdog information
public void move(MoverType movementType, Vec3 movement) {
@@ -31,7 +31,7 @@ index 658a3dfa4959589ac1e5b5c9b6a96f1522574daa..0e319cf3782137114ed3b60ccc7c3d25
final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
// Paper start - detailed watchdog information
io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
@@ -4184,6 +4192,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4183,6 +4191,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public final void setBoundingBox(AABB boundingBox) {

4
patches/server/0097-Skip-negligible-planar-movement-multiplication.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Skip negligible planar movement multiplication
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 0e319cf3782137114ed3b60ccc7c3d25ab109a64..0ea19bf7eeb238329631fae725bcab66cd4d07cf 100644
index 0e284a81464e6f2ffc73177fa289168e372c4265..45551001bd6f91bfbecb6a8ec4efa8ed730740e8 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1306,9 +1306,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1305,9 +1305,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
this.tryCheckInsideBlocks();

4
patches/server/0110-RNG-Fishing.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] RNG Fishing
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
index f959f1819181b867dfabd19005e730069dffda4d..85d041981641acb2487325f8f874f65ddfb61e67 100644
index e32bf7060285b5da72f5d6c5e2449d4319c856d5..3e111607ee1f42534b4244beb9e9ad82fd97dd43 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
@@ -506,7 +506,7 @@ public class FishingHook extends Projectile {
@@ -508,7 +508,7 @@ public class FishingHook extends Projectile {
} else if (this.nibble > 0) {
LootParams lootparams = (new LootParams.Builder((ServerLevel) this.level())).withParameter(LootContextParams.ORIGIN, this.position()).withParameter(LootContextParams.TOOL, usedItem).withParameter(LootContextParams.THIS_ENTITY, this).withLuck((float) this.luck + entityhuman.getLuck()).create(LootContextParamSets.FISHING);
LootTable loottable = this.level().getServer().reloadableRegistries().getLootTable(BuiltInLootTables.FISHING);

2
patches/server/0118-Disable-moved-wrongly-threshold.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable moved wrongly threshold
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index ca22905fa9948f85dcace5098ffd9807d338c93c..c39fbba316f97fa1e069360344c2d636bf08fade 100644
index 5ba41f7c9fd6526f71180ad8d1c3d7b443c5e2f2..141b868467bb8a8f8964f2427823dd4acd32e841 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -566,7 +566,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

4
patches/server/0126-Placing-locked-hopper-no-longer-send-NC-updates.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Placing locked hopper no longer send NC updates
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index c7f740be91ecbf9cb3baa30ae02b5751454fc23d..811fc5ad978157bed9577a603b90868571c0fe2f 100644
index ac9647b7232a860b87c0a15aa7971e243d311152..c9e7f2b93a3f5934710864310191433fe6d248d2 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -54,6 +54,7 @@ import net.minecraft.world.level.biome.BiomeManager;
@@ -16,7 +16,7 @@ index c7f740be91ecbf9cb3baa30ae02b5751454fc23d..811fc5ad978157bed9577a603b908685
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.TickingBlockEntity;
import net.minecraft.world.level.block.state.BlockState;
@@ -1023,7 +1024,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1024,7 +1025,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
if ((i & 1) != 0) {

4
patches/server/0133-Fix-falling-block-s-block-location.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix falling block's block location
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 0ea19bf7eeb238329631fae725bcab66cd4d07cf..df1ac24d30da9d4afe9e0f0ee6868343a7941614 100644
index 45551001bd6f91bfbecb6a8ec4efa8ed730740e8..5fd70e3b05ff9d89549d834209a8958467376e4a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4873,6 +4873,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4872,6 +4872,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
int j = Mth.floor(y);
int k = Mth.floor(z);