diff --git a/gradle.properties b/gradle.properties index 04d349d..3e8afdd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.samsuik.sakura version=1.21.3-R0.1-SNAPSHOT mcVersion=1.21.3 -paperRef=aee6f7abe161976fb6cb0558aeda5aef49845787 +paperRef=bf8405fcdd851aab3e01768845f5111064bfcc99 org.gradle.jvmargs=-Xmx2G org.gradle.vfs.watch=false diff --git a/patches/server/0003-Sakura-Configuration-Files.patch b/patches/server/0003-Sakura-Configuration-Files.patch index 5afc95e..1d5cb8d 100644 --- a/patches/server/0003-Sakura-Configuration-Files.patch +++ b/patches/server/0003-Sakura-Configuration-Files.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Sakura Configuration Files diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java -index 87e5f614ba988547a827486740db217e28585773..0375c9eb296ba7e8ed64e8d00dbc13a581dd4f90 100644 +index 8cf720f08514e8e4f62f4ad196f1277bd761c6b2..3e4a639f8ac00fee9b334b88da036c329a1a61d7 100644 --- a/src/main/java/io/papermc/paper/configuration/Configurations.java +++ b/src/main/java/io/papermc/paper/configuration/Configurations.java -@@ -96,7 +96,7 @@ public abstract class Configurations { +@@ -94,7 +94,7 @@ public abstract class Configurations { }; } @@ -17,7 +17,7 @@ index 87e5f614ba988547a827486740db217e28585773..0375c9eb296ba7e8ed64e8d00dbc13a5 return node -> { ObjectMapper.Factory factory = (ObjectMapper.Factory) Objects.requireNonNull(node.options().serializers().get(type)); ObjectMapper.Mutable mutable = (ObjectMapper.Mutable) factory.get(type); -@@ -231,7 +231,7 @@ public abstract class Configurations { +@@ -229,7 +229,7 @@ public abstract class Configurations { .path(worldConfigFile) .build(); final ConfigurationNode worldNode = worldLoader.load(); @@ -27,10 +27,10 @@ index 87e5f614ba988547a827486740db217e28585773..0375c9eb296ba7e8ed64e8d00dbc13a5 } else { this.verifyWorldConfigVersion(contextMap, worldNode); diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java -index 1029b6de6f36b08bf634b4056ef5701383f6f258..4b4087c316460c8ae262b62746430f521a9cc1a2 100644 +index c5644d8d64f12073e39bc6ed79c8714f4560ff89..9dd822d20f8f3cfe65162a62e1407626831beabf 100644 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java -@@ -165,7 +165,7 @@ public class PaperConfigurations extends Configurations builder .register(MapSerializer.TYPE, new MapSerializer(false)) .register(new EnumValueSerializer()) -@@ -459,7 +459,7 @@ public class PaperConfigurations extends Configurations TicketType create(String name, Comparator argumentComparator) { return new TicketType<>(name, argumentComparator, 0L); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index cc9afce726f5b269cd2afb21ffe81173e618781d..281c1d501ed40acd709a541d656d542ce595ac2a 100644 +index 4896f3334546b55385e93262dc1a16ef8bda7c45..d16ed3ea0ae380ddccb28a99062c7cccf84c4877 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -615,6 +615,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -616,6 +616,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess public boolean isPrimedTNT; public boolean isFallingBlock; // Sakura end - visibility api and command @@ -75,7 +75,7 @@ index cc9afce726f5b269cd2afb21ffe81173e618781d..281c1d501ed40acd709a541d656d542c public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); -@@ -1592,7 +1606,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1600,7 +1614,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.getCollisionsForBlocksOrWorldBorder( this.level, (Entity)(Object)this, initialCollisionBox, potentialCollisionsVoxel, potentialCollisionsBB, @@ -84,7 +84,7 @@ index cc9afce726f5b269cd2afb21ffe81173e618781d..281c1d501ed40acd709a541d656d542c ); potentialCollisionsBB.addAll(entityAABBs); final Vec3 collided = ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.performCollisions(movement, currentBox, potentialCollisionsVoxel, potentialCollisionsBB); -@@ -5235,12 +5249,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -5243,12 +5257,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @Override public boolean shouldBeSaved() { diff --git a/patches/server/0010-Slice-Packet-obfuscation-and-reduction.patch b/patches/server/0010-Slice-Packet-obfuscation-and-reduction.patch index cc73746..6687769 100644 --- a/patches/server/0010-Slice-Packet-obfuscation-and-reduction.patch +++ b/patches/server/0010-Slice-Packet-obfuscation-and-reduction.patch @@ -185,10 +185,10 @@ index 90eb4927fa51ce3df86aa7b6c71f49150a03e337..a960c7ac83cb32b2eb1f292fd9a561ba if (this.entity instanceof LivingEntity) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index eb0026368463aaac46dbbf1800032809041f7874..c1c933bd6d40b533e332948168db40ac7164fdea 100644 +index d16ed3ea0ae380ddccb28a99062c7cccf84c4877..124916e1ee9d32a530cbce90ed22fc1383cf49d1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3709,7 +3709,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3717,7 +3717,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID); return; } diff --git a/patches/server/0015-Store-Entity-Data-State.patch b/patches/server/0015-Store-Entity-Data-State.patch index b763e04..4011acf 100644 --- a/patches/server/0015-Store-Entity-Data-State.patch +++ b/patches/server/0015-Store-Entity-Data-State.patch @@ -52,10 +52,10 @@ index 0000000000000000000000000000000000000000..aeb5f128b369753cb20b7310fa382ddf + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c1c933bd6d40b533e332948168db40ac7164fdea..1fbe29291e2c8318427525f126842b9ce9f5b946 100644 +index 124916e1ee9d32a530cbce90ed22fc1383cf49d1..df2deeeaf473f84268288be5eb60a9a7068a8d46 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -629,6 +629,25 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -630,6 +630,25 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return flags; } // Sakura end - load chunks on movement @@ -82,7 +82,7 @@ index c1c933bd6d40b533e332948168db40ac7164fdea..1fbe29291e2c8318427525f126842b9c public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index b5ce268d1b9d8e57a3927c8e0b91746361fb6778..4696506402ab92439033cf01007fd78a543b5b37 100644 +index 932e64a75d6a2d0e6c82fd8917d3faa054c2512f..49b01f78529f067eee65b14e7906b9f1de768f06 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1499,6 +1499,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl diff --git a/patches/server/0016-Merge-Cannon-Entities.patch b/patches/server/0016-Merge-Cannon-Entities.patch index 636ca67..8d5c03f 100644 --- a/patches/server/0016-Merge-Cannon-Entities.patch +++ b/patches/server/0016-Merge-Cannon-Entities.patch @@ -438,10 +438,10 @@ index 0966857107117c59725e69352cd34f6c2228ae4b..4c02453b6663f369377940ece30e8a2a this.guardEntityTick(this::tickNonPassenger, entity); gameprofilerfiller.pop(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d9e236f8ec8735512d3bf02f07472b9be702bc9d..0b1eeefc0ff36665ffbba536e9944d74da0d94b0 100644 +index df2deeeaf473f84268288be5eb60a9a7068a8d46..21670e77ccaa442b289fa7bb5911716e24afcd4d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -648,6 +648,23 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -649,6 +649,23 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return to.entityState() != null && to.entityState().comparePositionAndMotion(this); } // Sakura end - store entity data/state @@ -465,7 +465,7 @@ index d9e236f8ec8735512d3bf02f07472b9be702bc9d..0b1eeefc0ff36665ffbba536e9944d74 public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); -@@ -5239,6 +5256,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -5247,6 +5264,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess if (this.removalReason != Entity.RemovalReason.UNLOADED_TO_CHUNK) { this.getPassengers().forEach(Entity::stopRiding); } // Paper - rewrite chunk system this.levelCallback.onRemove(entity_removalreason); this.onRemoval(entity_removalreason); diff --git a/patches/server/0020-Optimise-cannon-entity-movement.patch b/patches/server/0020-Optimise-cannon-entity-movement.patch index d3404ee..cfbb790 100644 --- a/patches/server/0020-Optimise-cannon-entity-movement.patch +++ b/patches/server/0020-Optimise-cannon-entity-movement.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Optimise cannon entity movement diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e369034397cabd79b67714402cf6431b94594285..b3eea40ba5315e1dd4ea7b2a5a61c53b63e909dc 100644 +index 21670e77ccaa442b289fa7bb5911716e24afcd4d..e963e972ae1006f977a68c69b7529c1da2f7bdf5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1250,6 +1250,75 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1258,6 +1258,75 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return this.moveStartZ; } // Paper end - detailed watchdog information @@ -84,7 +84,7 @@ index e369034397cabd79b67714402cf6431b94594285..b3eea40ba5315e1dd4ea7b2a5a61c53b public void move(MoverType type, Vec3 movement) { final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity -@@ -1611,6 +1680,107 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1619,6 +1688,107 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return offsetFactor; } diff --git a/patches/server/0021-Entity-pushed-by-fluid-API.patch b/patches/server/0021-Entity-pushed-by-fluid-API.patch index 9f58d14..98a49df 100644 --- a/patches/server/0021-Entity-pushed-by-fluid-API.patch +++ b/patches/server/0021-Entity-pushed-by-fluid-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity pushed by fluid API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b3eea40ba5315e1dd4ea7b2a5a61c53b63e909dc..de6a81d222cd5fef81be87c188b5a726710202f7 100644 +index e963e972ae1006f977a68c69b7529c1da2f7bdf5..fd8c05a58473633a2debea52f610912d314f7eb2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -665,6 +665,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -666,6 +666,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } } // Sakura end - merge cannon entities @@ -16,7 +16,7 @@ index b3eea40ba5315e1dd4ea7b2a5a61c53b63e909dc..de6a81d222cd5fef81be87c188b5a726 public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); -@@ -4482,7 +4483,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4490,7 +4491,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public boolean isPushedByFluid() { @@ -26,7 +26,7 @@ index b3eea40ba5315e1dd4ea7b2a5a61c53b63e909dc..de6a81d222cd5fef81be87c188b5a726 public static double getViewScale() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 179886dcbda29c5cdb7dbd43e44951ae38d9df96..d0da1b34fe10be266f5b711e5755f07521e0bf08 100644 +index ddabaed899c755925ad8618b78c33dacaf2126ac..83de2011a8b448b463bcd96e4a8ee8933590de58 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -204,6 +204,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0024-Optimise-TNT-fluid-state.patch b/patches/server/0024-Optimise-TNT-fluid-state.patch index bf7917e..e544c22 100644 --- a/patches/server/0024-Optimise-TNT-fluid-state.patch +++ b/patches/server/0024-Optimise-TNT-fluid-state.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Optimise TNT fluid state diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index de6a81d222cd5fef81be87c188b5a726710202f7..b6fe11f2e0cd92bc903445edd7f997baec4c3e75 100644 +index fd8c05a58473633a2debea52f610912d314f7eb2..babe513754ab4e211b9741ba94bc45670120c83e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2269,7 +2269,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2277,7 +2277,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return this.isInWater() || flag; } diff --git a/patches/server/0037-Configure-cannon-physics-by-version.patch b/patches/server/0037-Configure-cannon-physics-by-version.patch index 16b89b3..bfd785c 100644 --- a/patches/server/0037-Configure-cannon-physics-by-version.patch +++ b/patches/server/0037-Configure-cannon-physics-by-version.patch @@ -106,7 +106,7 @@ index ebe5f0c8c2f09920b5f5ef734e63f5e7cd8bd3a1..320cdb1f4e655a2d093890e88476df90 protected int getExplosionCount() { if (this.cause.getMergeEntityData().getMergeLevel() == MergeLevel.NONE) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index dc56dd43a0c3171f16310959a642bccacddb3bcc..18417d8b899edd8970291da4d5e1756d87d67531 100644 +index babe513754ab4e211b9741ba94bc45670120c83e..0e479e1960b3f054bf8991f5d429b37500319c4a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -385,7 +385,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -118,7 +118,7 @@ index dc56dd43a0c3171f16310959a642bccacddb3bcc..18417d8b899edd8970291da4d5e1756d public boolean isInPowderSnow; public boolean wasInPowderSnow; public Optional mainSupportingBlockPos; -@@ -666,6 +666,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -667,6 +667,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } // Sakura end - merge cannon entities public boolean pushedByFluid = true; // Sakura - entity pushed by fluid api @@ -132,7 +132,7 @@ index dc56dd43a0c3171f16310959a642bccacddb3bcc..18417d8b899edd8970291da4d5e1756d public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); -@@ -1197,7 +1204,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1205,7 +1212,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } protected void checkSupportingBlock(boolean onGround, @Nullable Vec3 movement) { @@ -141,7 +141,7 @@ index dc56dd43a0c3171f16310959a642bccacddb3bcc..18417d8b899edd8970291da4d5e1756d AABB axisalignedbb = this.getBoundingBox(); AABB axisalignedbb1 = new AABB(axisalignedbb.minX, axisalignedbb.minY - 1.0E-6D, axisalignedbb.minZ, axisalignedbb.maxX, axisalignedbb.minY, axisalignedbb.maxZ); Optional optional = this.level.findSupportingBlock(this, axisalignedbb1); -@@ -1257,7 +1264,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1265,7 +1272,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess if (this.noPhysics) { this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z); } else { @@ -150,7 +150,7 @@ index dc56dd43a0c3171f16310959a642bccacddb3bcc..18417d8b899edd8970291da4d5e1756d movement = this.limitPistonMovement(movement); if (movement.equals(Vec3.ZERO)) { return; -@@ -1275,8 +1282,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1283,8 +1290,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess Vec3 vec3d1 = this.sakura_collide(movement); double d0 = vec3d1.lengthSqr(); @@ -161,7 +161,7 @@ index dc56dd43a0c3171f16310959a642bccacddb3bcc..18417d8b899edd8970291da4d5e1756d BlockHitResult clipResult = this.level().clip(new ClipContext(this.position(), this.position().add(vec3d1), ClipContext.Block.FALLDAMAGE_RESETTING, ClipContext.Fluid.WATER, this)); if (clipResult.getType() != HitResult.Type.MISS) { this.resetFallDistance(); -@@ -1305,6 +1312,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1313,6 +1320,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } else { if (this.horizontalCollision) { Vec3 vec3d2 = this.getDeltaMovement(); @@ -173,7 +173,7 @@ index dc56dd43a0c3171f16310959a642bccacddb3bcc..18417d8b899edd8970291da4d5e1756d this.setDeltaMovement(movedX ? 0.0D : vec3d2.x, vec3d2.y, movedZ ? 0.0D : vec3d2.z); } -@@ -1710,7 +1722,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1718,7 +1730,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess bb = currBoundingBox.expandTowards(movement.x, movement.y, movement.z); } this.collectCollisions(bb, voxelList, bbList); @@ -182,7 +182,7 @@ index dc56dd43a0c3171f16310959a642bccacddb3bcc..18417d8b899edd8970291da4d5e1756d } private Vec3 collideAxisScan(Vec3 movement, AABB currBoundingBox, List voxelList, List bbList) { -@@ -1718,7 +1730,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1726,7 +1738,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess double y = movement.y; double z = movement.z; @@ -194,7 +194,7 @@ index dc56dd43a0c3171f16310959a642bccacddb3bcc..18417d8b899edd8970291da4d5e1756d if (y != 0.0) { y = this.scanY(currBoundingBox, y, voxelList, bbList); -@@ -1816,7 +1831,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1824,7 +1839,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.COLLISION_FLAG_CHECK_BORDER | this.getExtraCollisionFlags(), null // Sakura - load chunks on movement ); potentialCollisionsBB.addAll(entityAABBs); @@ -203,7 +203,7 @@ index dc56dd43a0c3171f16310959a642bccacddb3bcc..18417d8b899edd8970291da4d5e1756d final boolean collidedX = collided.x != movement.x; final boolean collidedY = collided.y != movement.y; -@@ -1983,7 +1998,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1991,7 +2006,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess private void checkInsideBlocks(List queuedCollisionChecks, Set collidedBlocks) { if (this.isAffectedByBlocks()) { @@ -215,7 +215,7 @@ index dc56dd43a0c3171f16310959a642bccacddb3bcc..18417d8b899edd8970291da4d5e1756d LongSet longset = this.visitedBlocks; Iterator iterator = queuedCollisionChecks.iterator(); -@@ -1991,7 +2009,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1999,7 +2017,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess Entity.Movement entity_b = (Entity.Movement) iterator.next(); Vec3 vec3d = entity_b.from(); Vec3 vec3d1 = entity_b.to(); diff --git a/patches/server/0044-Treat-solid-blocks-as-full-when-moving-fast.patch b/patches/server/0044-Treat-solid-blocks-as-full-when-moving-fast.patch index 2bb7b46..c442116 100644 --- a/patches/server/0044-Treat-solid-blocks-as-full-when-moving-fast.patch +++ b/patches/server/0044-Treat-solid-blocks-as-full-when-moving-fast.patch @@ -46,10 +46,10 @@ index 27b7be52f7617a6ecd1ff7e967604424f40027bc..417b18e1179f962e218f63679785e487 mutablePos.set(blockX, blockY, blockZ); blockCollision = blockData.getCollisionShape(world, mutablePos, collisionShape); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 18417d8b899edd8970291da4d5e1756d87d67531..ef81c093377c0cae5d729a17a0dc89ba9b0b118a 100644 +index 0e479e1960b3f054bf8991f5d429b37500319c4a..7a07be8dfabde5ab99c354bc7aef29fcf551c9e1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -626,6 +626,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -627,6 +627,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess flags |= ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.COLLISION_FLAG_ADD_TICKET; } diff --git a/patches/server/0057-Add-entity-travel-distance-limits.patch b/patches/server/0057-Add-entity-travel-distance-limits.patch index 1026987..6b3329b 100644 --- a/patches/server/0057-Add-entity-travel-distance-limits.patch +++ b/patches/server/0057-Add-entity-travel-distance-limits.patch @@ -21,10 +21,10 @@ index e39f4e4716b8794e506d3ffcbc35ae88d0fbc23a..a3c8ed82e46056be1a3ca002664e6fe6 } else { entity.inactiveTick(); } // Paper - EAR 2 gameprofilerfiller.pop(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ef81c093377c0cae5d729a17a0dc89ba9b0b118a..ee8816ec238a38667cdf0f0f749c02b78a6477bd 100644 +index 7a07be8dfabde5ab99c354bc7aef29fcf551c9e1..344c2bac7fc694e84532cd384be32e7d259e8130 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -681,6 +681,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -682,6 +682,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return this.physics; } // Sakura end - physics version api @@ -44,7 +44,7 @@ index ef81c093377c0cae5d729a17a0dc89ba9b0b118a..ee8816ec238a38667cdf0f0f749c02b7 public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); -@@ -733,6 +746,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -735,6 +748,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.entityData = datawatcher_a.build(); this.setPos(0.0D, 0.0D, 0.0D); this.eyeHeight = this.dimensions.eyeHeight(); diff --git a/patches/server/0074-Configurable-left-shooting-and-adjusting-limits.patch b/patches/server/0074-Configurable-left-shooting-and-adjusting-limits.patch index 7a87212..de97db6 100644 --- a/patches/server/0074-Configurable-left-shooting-and-adjusting-limits.patch +++ b/patches/server/0074-Configurable-left-shooting-and-adjusting-limits.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable left shooting and adjusting limits diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ee8816ec238a38667cdf0f0f749c02b78a6477bd..9adc5164580a291585789948091ec192aff6d968 100644 +index 344c2bac7fc694e84532cd384be32e7d259e8130..5067db32a3e024a27c1da8f76a0abade6f20096d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -694,6 +694,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -695,6 +695,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return Math.max(x, z) >= this.travelDistanceLimit; } // Sakura end - entity travel distance limits @@ -55,7 +55,7 @@ index ee8816ec238a38667cdf0f0f749c02b78a6477bd..9adc5164580a291585789948091ec192 public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); -@@ -1765,6 +1805,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1773,6 +1813,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } if (xSmaller && z != 0.0) { @@ -63,7 +63,7 @@ index ee8816ec238a38667cdf0f0f749c02b78a6477bd..9adc5164580a291585789948091ec192 z = this.scanZ(currBoundingBox, z, voxelList, bbList); if (z != 0.0) { currBoundingBox = ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.offsetZ(currBoundingBox, z); -@@ -1772,6 +1813,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1780,6 +1821,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } if (x != 0.0) { diff --git a/patches/server/0079-Optimise-check-inside-blocks-and-traverse-blocks.patch b/patches/server/0079-Optimise-check-inside-blocks-and-traverse-blocks.patch index e9c0ed4..0ccfaaa 100644 --- a/patches/server/0079-Optimise-check-inside-blocks-and-traverse-blocks.patch +++ b/patches/server/0079-Optimise-check-inside-blocks-and-traverse-blocks.patch @@ -71,10 +71,10 @@ index 0000000000000000000000000000000000000000..05e532f0aa3b1a5ab6570432662a8142 + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9adc5164580a291585789948091ec192aff6d968..f3222939d68fbfe5e134b2484dfa9936605f1e0c 100644 +index 5067db32a3e024a27c1da8f76a0abade6f20096d..3e6733b3195019f0090ae67136bbcf8467b8333a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2086,6 +2086,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2094,6 +2094,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } final Iterator iterator1 = positions.iterator(); // Sakura end - physics version api @@ -86,7 +86,7 @@ index 9adc5164580a291585789948091ec192aff6d968..f3222939d68fbfe5e134b2484dfa9936 while (iterator1.hasNext()) { BlockPos blockposition = (BlockPos) iterator1.next(); -@@ -2094,7 +2099,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2102,7 +2107,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return; }