Skip to content

Commit 56ed2dc

Browse files
kennytvkennytv
committed
More feature patches
1 parent b80114b commit 56ed2dc

9 files changed

+73
-73
lines changed

‎paper-server/patches/features/0003-Entity-Activation-Range-2.0.patch

+19-19
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ index 7a86892eb69b01656848c755a4cabacfc0dce8e6..09c6ebe91ca80552a487d01ab5394db2
366366
import org.slf4j.Logger;
367367

368368
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
369-
index e5777f1f67a3b96f4e03e1a90a0f2f6e159748ef..8b2d4f5ff1780a5bb0f9ce3617e2be6c8715a9f5 100644
369+
index 5e5ee5e3531e38d2a285de8c3a5a332945a6df93..e26239bc6185d81e2ce82579843a4017d7c10943 100644
370370
--- a/net/minecraft/server/level/ServerLevel.java
371371
+++ b/net/minecraft/server/level/ServerLevel.java
372372
@@ -544,6 +544,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -476,10 +476,10 @@ index bf44f6b9c8710e0c9a85d44f6217501abc98a7b1..bfd904e468bbf2cc1a5b3353d3a69ad5
476476
public void tick() {
477477
super.tick();
478478
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
479-
index 30c10dfe3b70a2b137b372ae1aa144f17733455b..7feeb2663fc1a52a72e7c47ae6f575cdc8d668a7 100644
479+
index 2002a211ada76f32fc2c66b51acbef1690278d0a..a8eaccde3ec9ed912cbc6df0b29e9f8136a46578 100644
480480
--- a/net/minecraft/world/entity/Entity.java
481481
+++ b/net/minecraft/world/entity/Entity.java
482-
@@ -389,6 +389,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
482+
@@ -388,6 +388,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
483483
private final int despawnTime; // Paper - entity despawn time limit
484484
public int totalEntityAge; // Paper - age-like counter for all entities
485485
public final io.papermc.paper.entity.activation.ActivationType activationType = io.papermc.paper.entity.activation.ActivationType.activationTypeFor(this); // Paper - EAR 2/tracking ranges
@@ -492,10 +492,10 @@ index 30c10dfe3b70a2b137b372ae1aa144f17733455b..7feeb2663fc1a52a72e7c47ae6f575cd
492492
+ public void inactiveTick() {
493493
+ }
494494
+ // Paper end - EAR 2
495+
// CraftBukkit end
495496

496-
public void setOrigin(@javax.annotation.Nonnull org.bukkit.Location location) {
497-
this.origin = location.toVector();
498-
@@ -424,6 +433,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
497+
// Paper start
498+
@@ -403,6 +412,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
499499
this.position = Vec3.ZERO;
500500
this.blockPosition = BlockPos.ZERO;
501501
this.chunkPosition = ChunkPos.ZERO;
@@ -509,7 +509,7 @@ index 30c10dfe3b70a2b137b372ae1aa144f17733455b..7feeb2663fc1a52a72e7c47ae6f575cd
509509
SynchedEntityData.Builder builder = new SynchedEntityData.Builder(this);
510510
builder.define(DATA_SHARED_FLAGS_ID, (byte)0);
511511
builder.define(DATA_AIR_SUPPLY_ID, this.getMaxAirSupply());
512-
@@ -993,6 +1009,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
512+
@@ -952,6 +968,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
513513
this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
514514
} else {
515515
if (type == MoverType.PISTON) {
@@ -520,7 +520,7 @@ index 30c10dfe3b70a2b137b372ae1aa144f17733455b..7feeb2663fc1a52a72e7c47ae6f575cd
520520
movement = this.limitPistonMovement(movement);
521521
if (movement.equals(Vec3.ZERO)) {
522522
return;
523-
@@ -1006,6 +1026,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
523+
@@ -965,6 +985,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
524524
this.stuckSpeedMultiplier = Vec3.ZERO;
525525
this.setDeltaMovement(Vec3.ZERO);
526526
}
@@ -535,10 +535,10 @@ index 30c10dfe3b70a2b137b372ae1aa144f17733455b..7feeb2663fc1a52a72e7c47ae6f575cd
535535
movement = this.maybeBackOffFromEdge(movement, type);
536536
Vec3 vec3 = this.collide(movement);
537537
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
538-
index e8fe7e8b25406e862d5f60dc096ff299ac00983c..36c04f06ba55cd0f9f7158692cd5cc1c59dcccc7 100644
538+
index 02ba7b842c77cdf843e3599b34fe1efef9a47d75..a9133d3918edb232df109ac5c3cd99512b3524ed 100644
539539
--- a/net/minecraft/world/entity/LivingEntity.java
540540
+++ b/net/minecraft/world/entity/LivingEntity.java
541-
@@ -3178,6 +3178,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
541+
@@ -3174,6 +3174,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
542542
return false;
543543
}
544544

@@ -554,10 +554,10 @@ index e8fe7e8b25406e862d5f60dc096ff299ac00983c..36c04f06ba55cd0f9f7158692cd5cc1c
554554
public void tick() {
555555
super.tick();
556556
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
557-
index 98d08a253afd2ba524a84d828338be00de1fd231..49eadf2b8a198719185101726a81958af9596585 100644
557+
index b50c13d2788216a85c952c3353581e403ec71b99..c86bf615421c7aef525b52389232c355e68efb7a 100644
558558
--- a/net/minecraft/world/entity/Mob.java
559559
+++ b/net/minecraft/world/entity/Mob.java
560-
@@ -207,6 +207,19 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
560+
@@ -206,6 +206,19 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
561561
return this.lookControl;
562562
}
563563

@@ -653,7 +653,7 @@ index 789fea258d70e60d38271ebb31270562dc7eb3ab..d0ab3db7bbd2942db19f473474371b20
653653
}
654654
}
655655
diff --git a/net/minecraft/world/entity/item/ItemEntity.java b/net/minecraft/world/entity/item/ItemEntity.java
656-
index 5af21eadecdba8cccc5d7b43fc2f47588955afee..1c06749c0a14fe0b42013842e8ed86669bb1eb6d 100644
656+
index ea3afc27600cde05a17197b071f14972d2c832e6..6c0ebfb2be4e8b884456a2aa3d5fdc87e45a0e3c 100644
657657
--- a/net/minecraft/world/entity/item/ItemEntity.java
658658
+++ b/net/minecraft/world/entity/item/ItemEntity.java
659659
@@ -131,6 +131,29 @@ public class ItemEntity extends Entity implements TraceableEntity {
@@ -687,10 +687,10 @@ index 5af21eadecdba8cccc5d7b43fc2f47588955afee..1c06749c0a14fe0b42013842e8ed8666
687687
public void tick() {
688688
if (this.getItem().isEmpty()) {
689689
diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
690-
index 9ca48d759b97c636e77277aa0dded80da99fe723..058b9815be752295be60be8a479d2dc4d6ed266c 100644
690+
index 94032c60944f161519f0ddee69426cbfe3075170..e0e0d2ea7fc60e3142c675404d152eca60263240 100644
691691
--- a/net/minecraft/world/entity/npc/Villager.java
692692
+++ b/net/minecraft/world/entity/npc/Villager.java
693-
@@ -276,11 +276,35 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
693+
@@ -268,11 +268,35 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
694694
return this.assignProfessionWhenSpawned;
695695
}
696696

@@ -727,7 +727,7 @@ index 9ca48d759b97c636e77277aa0dded80da99fe723..058b9815be752295be60be8a479d2dc4
727727
profilerFiller.pop();
728728
if (this.assignProfessionWhenSpawned) {
729729
this.assignProfessionWhenSpawned = false;
730-
@@ -304,7 +328,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
730+
@@ -296,7 +320,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
731731
this.lastTradedPlayer = null;
732732
}
733733

@@ -736,7 +736,7 @@ index 9ca48d759b97c636e77277aa0dded80da99fe723..058b9815be752295be60be8a479d2dc4
736736
Raid raidAt = level.getRaidAt(this.blockPosition());
737737
if (raidAt != null && raidAt.isActive() && !raidAt.isOver()) {
738738
level.broadcastEntityEvent(this, (byte)42);
739-
@@ -315,6 +339,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
739+
@@ -307,6 +331,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
740740
this.stopTrading();
741741
}
742742

@@ -745,7 +745,7 @@ index 9ca48d759b97c636e77277aa0dded80da99fe723..058b9815be752295be60be8a479d2dc4
745745
}
746746

747747
diff --git a/net/minecraft/world/entity/projectile/Arrow.java b/net/minecraft/world/entity/projectile/Arrow.java
748-
index e684e3883cf2e09ce93ea10eeccb42e3b86f85c9..692ca85fc85f0cd75eb4464a6bb6428b808e78bc 100644
748+
index 1f22f44abb21d1ed9a4870f668779efb8fd9b295..91ead824718eeea2afba3bc0ef619b8a24bb24b9 100644
749749
--- a/net/minecraft/world/entity/projectile/Arrow.java
750750
+++ b/net/minecraft/world/entity/projectile/Arrow.java
751751
@@ -70,6 +70,16 @@ public class Arrow extends AbstractArrow {
@@ -830,7 +830,7 @@ index 6162415095b030b4cc47364c56fa66236b3b0535..a56d9cdeb6589a053ffaaf2cd599a98a
830830
+
831831
}
832832
diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
833-
index 50caa965e48abe2f53e197c77d4ecfe1829d1e05..f18d5dda1791206c6db241730e42c75d176420ec 100644
833+
index 1ad1f9f790c07c50f7518837c4116bc70f99b8a6..040f4043ac795b8586dc0bff920faae049060074 100644
834834
--- a/net/minecraft/world/level/Level.java
835835
+++ b/net/minecraft/world/level/Level.java
836836
@@ -153,6 +153,12 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl

‎paper-server/patches/features/0004-Anti-Xray.patch

+12-12
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ index 3a384175f8e7f204234bbaf3081bdc20c47a0d4b..5699bc15eba92e22433a20cb8326b59f
144144

145145
private ClientboundLevelChunkWithLightPacket(RegistryFriendlyByteBuf buffer) {
146146
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
147-
index 8b2d4f5ff1780a5bb0f9ce3617e2be6c8715a9f5..cfc0a7fb91a4799608e2ecea19a3b2aa2c73a3e1 100644
147+
index e26239bc6185d81e2ce82579843a4017d7c10943..e7795a62e9e3ffdba21bf42f2f107b6087bae90e 100644
148148
--- a/net/minecraft/server/level/ServerLevel.java
149149
+++ b/net/minecraft/server/level/ServerLevel.java
150150
@@ -343,7 +343,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -155,7 +155,7 @@ index 8b2d4f5ff1780a5bb0f9ce3617e2be6c8715a9f5..cfc0a7fb91a4799608e2ecea19a3b2aa
155155
+ super(serverLevelData, dimension, server.registryAccess(), levelStem.type(), false, isDebug, biomeZoomSeed, server.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> server.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(levelStorageAccess.levelDirectory.path(), serverLevelData.getLevelName(), dimension.location(), spigotConfig, server.registryAccess(), serverLevelData.getGameRules())), dispatcher); // Paper - create paper world configs; Async-Anti-Xray: Pass executor
156156
this.pvpMode = server.isPvpAllowed();
157157
this.levelStorageAccess = levelStorageAccess;
158-
this.uuid = org.bukkit.craftbukkit.util.WorldUUID.getUUID(levelStorageAccess.levelDirectory.path().toFile());
158+
this.uuid = org.bukkit.craftbukkit.util.WorldUUID.getOrCreate(levelStorageAccess.levelDirectory.path().toFile());
159159
diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
160160
index ba818a3a09b09050a4373bee75536029bf85102e..830eaede4ffbd70324f9d2293f0e73341c8534a2 100644
161161
--- a/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -187,7 +187,7 @@ index 342bc843c384761e883de861044f4f8930ae8763..14878690a88fd4de3e2c127086607e6c
187187
if (io.papermc.paper.event.packet.PlayerChunkLoadEvent.getHandlerList().getRegisteredListeners().length > 0) {
188188
new io.papermc.paper.event.packet.PlayerChunkLoadEvent(new org.bukkit.craftbukkit.CraftChunk(chunk), packetListener.getPlayer().getBukkitEntity()).callEvent();
189189
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
190-
index d8bdad73f49ce3a5dfdfe27f70c9b144568246fa..9997b4d5bdf2b1d5898a3090eed8a260a0c5da01 100644
190+
index 8b5a8929e7ca7d2e9534435308bdc7f7352791f9..69ee33bdd9ce8296b5601ee51e5f4940f14d4eb2 100644
191191
--- a/net/minecraft/server/players/PlayerList.java
192192
+++ b/net/minecraft/server/players/PlayerList.java
193193
@@ -407,7 +407,7 @@ public abstract class PlayerList {
@@ -200,7 +200,7 @@ index d8bdad73f49ce3a5dfdfe27f70c9b144568246fa..9997b4d5bdf2b1d5898a3090eed8a260
200200
}
201201
// Paper end - Send empty chunk
202202
diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
203-
index f18d5dda1791206c6db241730e42c75d176420ec..770f2925f7026f7c33ba31ff6c557d8cb082bdb7 100644
203+
index 040f4043ac795b8586dc0bff920faae049060074..e0f6fd94e628973ba9b99fbdf1e1bfc2e68b8f6d 100644
204204
--- a/net/minecraft/world/level/Level.java
205205
+++ b/net/minecraft/world/level/Level.java
206206
@@ -168,6 +168,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
@@ -209,9 +209,9 @@ index f18d5dda1791206c6db241730e42c75d176420ec..770f2925f7026f7c33ba31ff6c557d8c
209209

210210
+ public final io.papermc.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
211211
public static BlockPos lastPhysicsProblem; // Spigot
212-
private org.spigotmc.TickLimiter entityLimiter;
213-
private org.spigotmc.TickLimiter tileLimiter;
214-
@@ -214,7 +215,8 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
212+
private int tileTickPosition;
213+
public final Map<ServerExplosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
214+
@@ -212,7 +213,8 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
215215
org.bukkit.generator.BiomeProvider biomeProvider, // CraftBukkit
216216
org.bukkit.World.Environment env, // CraftBukkit
217217
java.util.function.Function<org.spigotmc.SpigotWorldConfig, // Spigot - create per world config
@@ -221,15 +221,15 @@ index f18d5dda1791206c6db241730e42c75d176420ec..770f2925f7026f7c33ba31ff6c557d8c
221221
) {
222222
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) levelData).getLevelName()); // Spigot
223223
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
224-
@@ -295,6 +297,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
224+
@@ -291,6 +293,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
225+
public void onBorderSetDamageSafeZOne(WorldBorder border, double safeZoneRadius) {}
226+
});
225227
// CraftBukkit end
226-
this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime);
227-
this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
228228
+ this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new io.papermc.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : io.papermc.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
229229
}
230230

231231
// Paper start - Cancel hit for vanished players
232-
@@ -499,6 +502,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
232+
@@ -496,6 +499,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
233233
snapshot.setFlags(flags); // Paper - always set the flag of the most recent call to mitigate issues with multiple update at the same pos with different flags
234234
}
235235
BlockState blockState = chunkAt.setBlockState(pos, state, flags);
@@ -260,7 +260,7 @@ index d8d8d295e7fcd453b02d487ff6586167cb3019f8..d7d9bea40e2e7a18c447aed0798e9176
260260
}
261261
}
262262
diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
263-
index bedbf96b6f59f32ce87d1e6e21dc2c50b2064ddd..a9a7455f676f0194e61a996ecfd9e9831b386adc 100644
263+
index e36a89f72fa09cc1a163fc35d7aeb5872f771032..493b0ed0f80521be8f38b31596d47f93712d8037 100644
264264
--- a/net/minecraft/world/level/chunk/LevelChunk.java
265265
+++ b/net/minecraft/world/level/chunk/LevelChunk.java
266266
@@ -110,7 +110,7 @@ public class LevelChunk extends ChunkAccess {

‎paper-server/patches/features/0006-Optimize-Collision-to-not-load-chunks.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ movement will load only the chunk the player enters anyways and avoids loading
1414
massive amounts of surrounding chunks due to large AABB lookups.
1515

1616
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
17-
index 054ece1d539d69a4b7eec57e681179343c7e75c3..6f35067c64f378e955261e763f2bda9a0a6d0153 100644
17+
index a8eaccde3ec9ed912cbc6df0b29e9f8136a46578..0f6ca6ef161ac2934ba761a1eca3215290c7262b 100644
1818
--- a/net/minecraft/world/entity/Entity.java
1919
+++ b/net/minecraft/world/entity/Entity.java
20-
@@ -218,6 +218,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
20+
@@ -223,6 +223,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
2121
// Paper end - Share random for entities to make them more random
22-
public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason; // Paper - Entity#getEntitySpawnReason
22+
public @Nullable org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason; // Paper - Entity#getEntitySpawnReason
2323

2424
+ public boolean collisionLoadChunks = false; // Paper
2525
private @Nullable org.bukkit.craftbukkit.entity.CraftEntity bukkitEntity;
2626

2727
public org.bukkit.craftbukkit.entity.CraftEntity getBukkitEntity() {
2828
diff --git a/net/minecraft/world/level/BlockCollisions.java b/net/minecraft/world/level/BlockCollisions.java
29-
index fd2c338db43aad070cc32c24891b40599c544ac9..2861ea4b699d403b1245f8be5a62503d366ded65 100644
29+
index ed6e4f9fd0c7ad1219e66bc1cb4038191dd6edd8..45a20dbb935b12d429153463dba5d6fd3385dd7a 100644
3030
--- a/net/minecraft/world/level/BlockCollisions.java
3131
+++ b/net/minecraft/world/level/BlockCollisions.java
3232
@@ -80,16 +80,37 @@ public class BlockCollisions<T> extends AbstractIterator<T> {
@@ -76,7 +76,7 @@ index fd2c338db43aad070cc32c24891b40599c544ac9..2861ea4b699d403b1245f8be5a62503d
7676
&& (nextType != 2 || blockState.is(Blocks.MOVING_PISTON))) {
7777
VoxelShape collisionShape = this.context.getCollisionShape(blockState, this.collisionGetter, this.pos);
7878
diff --git a/net/minecraft/world/level/CollisionGetter.java b/net/minecraft/world/level/CollisionGetter.java
79-
index cb54c3aadd8f3c719d3f7ef1fda4aa517919b7c3..844f76a38884e823a558fe59c421ffd4711f80b4 100644
79+
index 79af1e4dd1f84580e509ac3e9a77bcd5531c8da6..a031d39854eb049a701f3de9e11c73419883d5ca 100644
8080
--- a/net/minecraft/world/level/CollisionGetter.java
8181
+++ b/net/minecraft/world/level/CollisionGetter.java
8282
@@ -50,11 +50,13 @@ public interface CollisionGetter extends BlockGetter {

‎paper-server/patches/features/0008-Optimize-Voxel-Shape-Merging.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ index 60b56a5086b8aad0fad693f686b89138b3a4c80d..5b079ec43c259368d0eed4e838588071
6767
this.firstIndices = new int[i];
6868
this.secondIndices = new int[i];
6969
diff --git a/net/minecraft/world/phys/shapes/Shapes.java b/net/minecraft/world/phys/shapes/Shapes.java
70-
index e1b4c4b53844b0755e0640a05e8782fd9a7700a2..e759221fb54aa510d2d8bbba47e1d794367aec6d 100644
70+
index fe8361535526d9aabdf80390aa84570c580981aa..e6038bbe8513e434daa9ea10bfa817afef0445db 100644
7171
--- a/net/minecraft/world/phys/shapes/Shapes.java
7272
+++ b/net/minecraft/world/phys/shapes/Shapes.java
73-
@@ -279,9 +279,22 @@ public final class Shapes {
73+
@@ -286,9 +286,22 @@ public final class Shapes {
7474
}
7575

7676
@VisibleForTesting
@@ -94,7 +94,7 @@ index e1b4c4b53844b0755e0640a05e8782fd9a7700a2..e759221fb54aa510d2d8bbba47e1d794
9494
if (list1 instanceof CubePointRange && list2 instanceof CubePointRange) {
9595
long l = lcm(i, i1);
9696
if (size * l <= 256L) {
97-
@@ -289,14 +302,21 @@ public final class Shapes {
97+
@@ -296,14 +309,21 @@ public final class Shapes {
9898
}
9999
}
100100

0 commit comments

Comments
 (0)