Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2026-01-04 15:31:43 +00:00
Code Issues Releases Activity

Updated Upstream (Paper 1.21.3)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2ef589c okaaay let's go
PaperMC/Paper@d0028b7 you saw nothing
PaperMC/Paper@e080b20 Bundles are no longer experimental (thanks lynx)
PaperMC/Paper@d280061 First batch of server patches
PaperMC/Paper@3585434 first 100!
PaperMC/Paper@6b27267 oops
PaperMC/Paper@152e82c Some work
PaperMC/Paper@9e92fed More work?
PaperMC/Paper@f1649d7 Work it
PaperMC/Paper@9d63c81 Work work work
PaperMC/Paper@dc5af48 Breakpoint before projectile mess
PaperMC/Paper@7c04a31 Update projectile launch to 1.21.2
PaperMC/Paper@a400929 242
PaperMC/Paper@8851d25 Fluid Flowing ifLoaded patch
PaperMC/Paper@f677393 Skip Improve-exact-choice-recipe-ingredients for now
PaperMC/Paper@5e262c1 298
PaperMC/Paper@aa37f72 Patches
PaperMC/Paper@af125d2 Patch
PaperMC/Paper@6bfc6db Patch
PaperMC/Paper@09b625e 400
PaperMC/Paper@1f8b537 440
PaperMC/Paper@f5177aa Some more work
PaperMC/Paper@2810f50 503
PaperMC/Paper@0bb4d1d 553
PaperMC/Paper@4db2503 Work work work work
PaperMC/Paper@cbf6416 A bunch of patches
PaperMC/Paper@6456b5d A bunch more 637
PaperMC/Paper@cb79de8 moooore
PaperMC/Paper@1dc1425 MOOOOORE
PaperMC/Paper@d52e2d2 MOOOOOOOORE
PaperMC/Paper@4baf9ab MOOOOOOOOOOORE
PaperMC/Paper@dd87f9f fix gruesome copyright violation
PaperMC/Paper@5a6011c MOOOOOOOOOOOOOORE
PaperMC/Paper@5d19e2b good luck americans
PaperMC/Paper@457d035 Patches, patches, patches
PaperMC/Paper@80de05f Patch me this, patch me that
PaperMC/Paper@26f7b4c Patch
PaperMC/Paper@89bf081 Patch
PaperMC/Paper@7d4cce9 Patch
PaperMC/Paper@b237528 Readd wrongly removed diff
PaperMC/Paper@fc05430 963
PaperMC/Paper@9047541 Upstream update
PaperMC/Paper@d67e55d Checkpoint
PaperMC/Paper@fe142cd Anti Xray
PaperMC/Paper@35e01d7 Update work 989
PaperMC/Paper@7616ebc 1000
PaperMC/Paper@6a31574 1020
PaperMC/Paper@227caac Wrong attempt at Tag lifecycle
PaperMC/Paper@afbb0d8 1037
PaperMC/Paper@b06e0b0 Work on compile errors
PaperMC/Paper@9c83387 Compile issues 1
PaperMC/Paper@0f011a3 Some more compile issues
PaperMC/Paper@6fb86bb Compiler issues v2
PaperMC/Paper@918ca96 Compiler issues v3
PaperMC/Paper@bb124f4 Compiler issues v4
PaperMC/Paper@0a8fd78 Compiler issue v5
PaperMC/Paper@e19f484 Test compile fixes
PaperMC/Paper@3518974 fix some issues
PaperMC/Paper@6df21e6 Start Moonrise update
PaperMC/Paper@47258a7 Move common diffs to MCUtils
PaperMC/Paper@ecf4d97 Begin fixing issues
PaperMC/Paper@8e569ba Merge patches
PaperMC/Paper@3b31621 Implement config hooks in PaperHooks
PaperMC/Paper@e9c58f5 Implement chunk tick iteration optimisations
PaperMC/Paper@2a95ad1 Implement explosion optimisations
PaperMC/Paper@16d2c9d Implement Starlight
PaperMC/Paper@3d7b570 Implement chunk system
PaperMC/Paper@1d341df Fix some compile errors from patches
PaperMC/Paper@6daedd7 Prepare rebase
PaperMC/Paper@75e3409 Complete rebase, start review
PaperMC/Paper@f1a11a6 Finish mixin diff review
PaperMC/Paper@a911f4a Prepare rebase
PaperMC/Paper@35ef293 Finish rebase
PaperMC/Paper@9ecf77e Fix compile issues
PaperMC/Paper@62e3bcd Review patch-to-patch diff
PaperMC/Paper@b711764 Rebase fixups
PaperMC/Paper@2e76d3f Specify mainCapabilityAttribute for paper-api
PaperMC/Paper@e4efb59 fix compile issues
PaperMC/Paper@683ce20 Fix Anti-Xray using wrong data in chunk deserialize
PaperMC/Paper@e92607c Fix MSPT command
PaperMC/Paper@dcd81a8 Fix crafting (and server icon)
PaperMC/Paper@61136fe Add max minecarft speed gamerule config
PaperMC/Paper@ba1ee87 Revert "Add max minecarft speed gamerule config"
PaperMC/Paper@cf03bed Add startup flag to disable gamerule limits
PaperMC/Paper@be2edea Fix boats/minecarts not dropping when destroyed
PaperMC/Paper@b14d336 Apply watchdoge patches
PaperMC/Paper@2946dbb Update WorldServer#serverlevelData mapping
PaperMC/Paper@98af0e0 update generator
PaperMC/Paper@20507b4 Apply more patches
PaperMC/Paper@7162ff0 fix item meta
PaperMC/Paper@7d67d3f fix DamageTypeTags init
PaperMC/Paper@0971875 re-add improve perf of mass crafts
PaperMC/Paper@bcf52fe Delete some old patches
PaperMC/Paper@348c855 Readd last API patch (with TODO)
PaperMC/Paper@b630564 More patches
PaperMC/Paper@3cb16c9 Add back per player mob spawning
PaperMC/Paper@fe7b741 Another one
PaperMC/Paper@12ed021 Update material tags and entity effect
PaperMC/Paper@02bca1e Remove timings impl
PaperMC/Paper@4d87302 Fix NPE and StackOverflowError for dispensers
PaperMC/Paper@f8f230a Remove unnecessary AT
PaperMC/Paper@29bf7be Fix unused parameter in PlayerList#remove
PaperMC/Paper@9e35192 Execute spark tasks during tick sleep (#11525)
PaperMC/Paper@e35f199 Use declaration order for state holder property iteration
PaperMC/Paper@6288adb Remove leftover missed timings calls (#11527)
PaperMC/Paper@99b1bf9 Use new ClientboundPlayerRotationPacket for setting player rotation
PaperMC/Paper@40211a0 Update Gradle wrapper to 8.10.2
PaperMC/Paper@49eae0d remove some leftovers
PaperMC/Paper@d576cfc cleanup bugfix patch
PaperMC/Paper@1196ab5 Avoid issues with certain tasks not processing during sleep (#11526)
PaperMC/Paper@fe2f3d4 Fix portal exit resulting in bad teleport transition
PaperMC/Paper@9f1fa0b Fix item gravity on inactive items, remove dumb active skipping
PaperMC/Paper@1a1d0cf Use target pitch in teleport (generally the same thing)
PaperMC/Paper@8ba3073 fix "is_freezing" damage type tag
PaperMC/Paper@1523212 don't resend effects when PlayerItemConsumeEvent is cancelled
PaperMC/Paper@1330880 Add Friction API to minecarts
PaperMC/Paper@580a610 Allow using old ender pearl behavior & apply ender pearl exploit patch (#11524)
PaperMC/Paper@40a960d Rebuild patches
This commit is contained in:
Samsuik
2024-10-30 23:59:24 +00:00
parent 56429ad767
commit 133fe330ae
90 changed files with 1638 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
patches/server/0007-Load-Chunks-on-Movement.patch
View File

@@ -5,45 +5,44 @@ Subject: [PATCH] Load Chunks on Movement
diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java b/src/main/java/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java
index 748ab4d637ce463272bae4fdbab6842a27385126..ea6e252053b8910141aacd5bb82108d6abf3fb96 100644
index 3abd4ad6379c383c3a31931255292b42d9435694..149e461fcb23b2ed7ae8dcc09837de501ba9eafb 100644
--- a/src/main/java/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java
+++ b/src/main/java/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java
@@ -1574,6 +1574,7 @@ public final class CollisionUtil {
@@ -1910,6 +1910,7 @@ public final class CollisionUtil {
public static final int COLLISION_FLAG_COLLIDE_WITH_UNLOADED_CHUNKS = 1 << 1;
public static final int COLLISION_FLAG_CHECK_BORDER = 1 << 2;
public static final int COLLISION_FLAG_CHECK_ONLY = 1 << 3;
+ public static final int COLLISION_FLAG_ADD_TICKET = 1 << 4; // Sakura - load chunks on movement
public static boolean getCollisionsForBlocksOrWorldBorder(final net.minecraft.world.level.Level world, final net.minecraft.world.entity.Entity entity, final net.minecraft.world.phys.AABB aabb,
final java.util.List<net.minecraft.world.phys.shapes.VoxelShape> intoVoxel, final java.util.List<net.minecraft.world.phys.AABB> intoAABB,
@@ -1624,6 +1625,7 @@ public final class CollisionUtil {
public static boolean getCollisionsForBlocksOrWorldBorder(final Level world, final Entity entity, final AABB aabb,
final List<VoxelShape> intoVoxel, final List<AABB> intoAABB,
@@ -1960,6 +1961,7 @@ public final class CollisionUtil {
final int maxChunkZ = maxBlockZ >> 4;
final boolean loadChunks = (collisionFlags & COLLISION_FLAG_LOAD_CHUNKS) != 0;
+ final boolean addTicket = (collisionFlags & COLLISION_FLAG_ADD_TICKET) != 0; // Sakura
final net.minecraft.world.level.chunk.ChunkSource chunkSource = world.getChunkSource();
+ final boolean addTicket = (collisionFlags & COLLISION_FLAG_ADD_TICKET) != 0; // Sakura - load chunks on movement
final ChunkSource chunkSource = world.getChunkSource();
for (int currChunkZ = minChunkZ; currChunkZ <= maxChunkZ; ++currChunkZ) {
@@ -1642,6 +1644,14 @@ public final class CollisionUtil {
@@ -1978,6 +1980,13 @@ public final class CollisionUtil {
continue;
}
+ // Sakura start - load chunks on movement
+ if (addTicket && chunk.movementTicketNeedsUpdate() && chunkSource instanceof net.minecraft.server.level.ServerChunkCache chunkCache) {
+ final long chunkKey = ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkKey(currChunkX, currChunkZ);
+ chunkCache.chunkMap.getDistanceManager().getChunkHolderManager().addTicketAtLevel(net.minecraft.server.level.TicketType.ENTITY_MOVEMENT, currChunkX, currChunkZ, 31, chunkKey);
+ chunkCache.chunkMap.getDistanceManager().moonrise$getChunkHolderManager().addTicketAtLevel(net.minecraft.server.level.TicketType.ENTITY_MOVEMENT, currChunkX, currChunkZ, 31, chunkKey);
+ chunk.updatedMovementTicket();
+ }
+ // Sakura end - load chunks on movement
+
final net.minecraft.world.level.chunk.LevelChunkSection[] sections = chunk.getSections();
final LevelChunkSection[] sections = chunk.getSections();
// bound y
diff --git a/src/main/java/net/minecraft/server/level/TicketType.java b/src/main/java/net/minecraft/server/level/TicketType.java
index f56e5c0f53f9b52a9247b9be9265b949494fc924..f8e0746433057297c88f0237502da85622297cef 100644
index e701f57ac8b0efdf739389f9be7a255220bb3e21..35a437f3acfd2659341abd8ab6a3b21c00594ba9 100644
--- a/src/main/java/net/minecraft/server/level/TicketType.java
+++ b/src/main/java/net/minecraft/server/level/TicketType.java
@@ -25,6 +25,7 @@ public class TicketType<T> {
@@ -26,6 +26,7 @@ public class TicketType<T> {
public static final TicketType<ChunkPos> UNKNOWN = TicketType.create("unknown", Comparator.comparingLong(ChunkPos::toLong), 1);
public static final TicketType<Unit> PLUGIN = TicketType.create("plugin", (a, b) -> 0); // CraftBukkit
public static final TicketType<org.bukkit.plugin.Plugin> PLUGIN_TICKET = TicketType.create("plugin_ticket", (plugin1, plugin2) -> plugin1.getClass().getName().compareTo(plugin2.getClass().getName())); // CraftBukkit
@@ -52,10 +51,10 @@ index f56e5c0f53f9b52a9247b9be9265b949494fc924..f8e0746433057297c88f0237502da856
public static <T> TicketType<T> create(String name, Comparator<T> 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 d2e91843df93753a78bb9bd6839de287dc2ce4e5..87a117c74dcee2e58126e133b853a56a7965e55f 100644
index eec06c841ae4dc9b3bf9c59d47352b4bd859c9c8..4be6b57d11c48da84a58b025fddb2b6aafaec55a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -553,6 +553,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -614,6 +614,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
public boolean isPrimedTNT;
public boolean isFallingBlock;
// Sakura end - visibility api and command
@@ -76,16 +75,16 @@ index d2e91843df93753a78bb9bd6839de287dc2ce4e5..87a117c74dcee2e58126e133b853a56a
public Entity(EntityType<?> type, Level world) {
this.id = Entity.ENTITY_COUNTER.incrementAndGet();
@@ -1504,7 +1518,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1591,7 +1605,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.getCollisions(
world, (Entity)(Object)this, collisionBox, potentialCollisionsVoxel, potentialCollisionsBB,
- ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.COLLISION_FLAG_CHECK_BORDER,
+ ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.COLLISION_FLAG_CHECK_BORDER | this.getExtraCollisionFlags(), // Sakura - load chunks on movement
null, null
ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.getCollisionsForBlocksOrWorldBorder(
this.level, (Entity)(Object)this, initialCollisionBox, potentialCollisionsVoxel, potentialCollisionsBB,
- ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.COLLISION_FLAG_CHECK_BORDER, null
+ ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.COLLISION_FLAG_CHECK_BORDER | this.getExtraCollisionFlags(), null // Sakura - load chunks on movement
);
@@ -4874,12 +4888,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
potentialCollisionsBB.addAll(entityAABBs);
final Vec3 collided = ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.performCollisions(movement, currentBox, potentialCollisionsVoxel, potentialCollisionsBB);
@@ -5205,12 +5219,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@Override
public boolean shouldBeSaved() {
@@ -99,9 +98,9 @@ index d2e91843df93753a78bb9bd6839de287dc2ce4e5..87a117c74dcee2e58126e133b853a56a
+ return this.loadChunks; // Sakura - load chunks on movement; always tick in unloaded & lazy chunks
}
public boolean mayInteract(Level world, BlockPos pos) {
public boolean mayInteract(ServerLevel world, BlockPos pos) {
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
index 1bfdebe6c1057ee19fb96d8f0f571c9d20d14cc6..eaafd4905229d111381c188d5373196a9f9288ab 100644
index 4a50ef9b25b9162815b879c60c294ed4be2edd5c..6127993804a8c0b342d74c62f163b8371f7c049b 100644
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
@@ -79,6 +79,7 @@ public class FallingBlockEntity extends Entity {
@@ -113,11 +112,11 @@ index 1bfdebe6c1057ee19fb96d8f0f571c9d20d14cc6..eaafd4905229d111381c188d5373196a
public FallingBlockEntity(Level world, double x, double y, double z, BlockState block) {
diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
index ef245198ce6385c66f58e0dbcdebffbe6d2b625e..b7c8c2335d59853dbc97d3b9496b5e3a63f0d9ab 100644
index eff8a8353b513da72e18f993fd41494291bdff3a..2ddfea0dd64cf6a2295583b747ab195346c24530 100644
--- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
@@ -58,6 +58,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
super(type, world);
@@ -64,6 +64,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
this.explosionPower = 4.0F;
this.blocksBuilding = true;
this.isPrimedTNT = true; // Sakura
+ this.loadChunks = world.sakuraConfig().cannons.loadChunks; // Sakura - load chunks on movement
@@ -125,10 +124,10 @@ index ef245198ce6385c66f58e0dbcdebffbe6d2b625e..b7c8c2335d59853dbc97d3b9496b5e3a
public PrimedTnt(Level world, double x, double y, double z, @Nullable LivingEntity igniter) {
diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
index 75c8125e20b70433fe9d143a3193d821043327c3..20764fba3c7cfe26cf622c3ee4848839408fa6af 100644
index a402e2f774cfc062afab8d86969f3e6f38874063..d95c15bff4e7ab241c63b0abeaaaca0d07fd77ae 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
@@ -140,6 +140,17 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom
@@ -140,6 +140,17 @@ public abstract class ChunkAccess implements BiomeManager.NoiseBiomeSource, Ligh
private final int minSection;
private final int maxSection;
// Paper end - get block chunk optimisation