Repo-Mirror/SparklyPaperMC
9
0
Fork 0
mirror of https://github.com/SparklyPower/SparklyPaper.git synced 2025-12-19 15:09:27 +00:00
Code Issues Releases Activity

Update to Paper 28d07dc5ab5e96c1a471bc37b613d158c5c7f197

Browse Source
This commit is contained in:
MrPowerGamerBR
2025-02-23 18:36:51 -03:00
parent 9ce818972c
commit f21ed3f64f
3 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group=net.sparklypower.sparklypaper
version=1.21.4-R0.1-SNAPSHOT
mcVersion=1.21.4
paperRef=6cfa2f7f315cbad23d7b12984b751f2721b496b6
paperRef=28d07dc5ab5e96c1a471bc37b613d158c5c7f197
org.gradle.configuration-cache=true
org.gradle.caching=true

4
sparklypaper-server/paper-patches/features/0007-Add-CraftItemRecipeEvent.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Add CraftItemRecipeEvent
Used when a player OR a crafter block crafts an item, as an alternative to PrepareItemCraftEvent and CraftItemEvent, because both events are not triggered when a item is crafted from a crafter
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index d7a52220e9525502163f5ee6afbadf2baaae6190..bbd000e3a3e9112e10a09e5d3ef6851b28e900fa 100644
index 57c3f8531bf85b53af3a4aad6e9e369d5cff0ce3..80bb0371eed48dbcb0e4e62dfc7f23f8514bdf77 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1472,6 +1472,24 @@ public class CraftEventFactory {
@@ -1474,6 +1474,24 @@ public class CraftEventFactory {
Bukkit.getPluginManager().callEvent(crafterCraftEvent);
return crafterCraftEvent;
}

28
sparklypaper-server/paper-patches/features/0009-Parallel-world-ticking.patch
View File

@@ -283,7 +283,7 @@ index 69cdd304d255d52c9b7dc9b6a33ffdb630b79abe..d8314bae08146f75442c342275d2e94b
+ // SparklyPaper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 600a0f423a83d9ecb0394faffc6b5ab79c69d6c6..d7b274500babff801984801edb12e1686ce73954 100644
index 1439d282167dc8a2e66f4896849153b810112988..7feeb6944848a9615fd6807cae2d7558a96ac350 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -455,7 +455,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -295,15 +295,7 @@ index 600a0f423a83d9ecb0394faffc6b5ab79c69d6c6..d7b274500babff801984801edb12e168
if (!this.isChunkLoaded(x, z)) {
return true;
}
@@ -478,6 +478,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
if (!unloadChunk0(x, z, false)) {
return false;
}
+ ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this.world, x, z, "Cannot regenerate chunk asynchronously"); // SparklyPaper - parallel world ticking (additional concurrency issues logs)
warnUnsafeChunk("regenerating a faraway chunk", x, z); // Paper
final long chunkKey = ChunkCoordIntPair.pair(x, z);
@@ -499,6 +500,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -472,6 +472,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean refreshChunk(int x, int z) {
@@ -311,7 +303,7 @@ index 600a0f423a83d9ecb0394faffc6b5ab79c69d6c6..d7b274500babff801984801edb12e168
ChunkHolder playerChunk = this.world.getChunkSource().chunkMap.getVisibleChunkIfPresent(ChunkPos.asLong(x, z));
if (playerChunk == null) return false;
@@ -549,7 +551,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -522,7 +523,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean loadChunk(int x, int z, boolean generate) {
@@ -320,7 +312,7 @@ index 600a0f423a83d9ecb0394faffc6b5ab79c69d6c6..d7b274500babff801984801edb12e168
warnUnsafeChunk("loading a faraway chunk", x, z); // Paper
ChunkAccess chunk = this.world.getChunkSource().getChunk(x, z, generate || isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // Paper
@@ -777,6 +779,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -750,6 +751,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean generateTree(Location loc, TreeType type, BlockChangeDelegate delegate) {
@@ -328,7 +320,7 @@ index 600a0f423a83d9ecb0394faffc6b5ab79c69d6c6..d7b274500babff801984801edb12e168
this.world.captureTreeGeneration = true;
this.world.captureBlockStates = true;
boolean grownTree = this.generateTree(loc, type);
@@ -892,6 +895,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -865,6 +867,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, Entity source, Consumer<net.minecraft.world.level.ServerExplosion> configurator) {
// Paper end - expand explosion API
@@ -336,7 +328,7 @@ index 600a0f423a83d9ecb0394faffc6b5ab79c69d6c6..d7b274500babff801984801edb12e168
net.minecraft.world.level.Level.ExplosionInteraction explosionType;
if (!breakBlocks) {
explosionType = net.minecraft.world.level.Level.ExplosionInteraction.NONE; // Don't break blocks
@@ -983,6 +987,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -956,6 +959,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public int getHighestBlockYAt(int x, int z, org.bukkit.HeightMap heightMap) {
@@ -344,7 +336,7 @@ index 600a0f423a83d9ecb0394faffc6b5ab79c69d6c6..d7b274500babff801984801edb12e168
warnUnsafeChunk("getting a faraway chunk", x >> 4, z >> 4); // Paper
// Transient load for this tick
return this.world.getChunk(x >> 4, z >> 4).getHeight(CraftHeightMap.toNMS(heightMap), x, z);
@@ -1013,6 +1018,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -986,6 +990,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public void setBiome(int x, int y, int z, Holder<net.minecraft.world.level.biome.Biome> bb) {
BlockPos pos = new BlockPos(x, 0, z);
@@ -352,7 +344,7 @@ index 600a0f423a83d9ecb0394faffc6b5ab79c69d6c6..d7b274500babff801984801edb12e168
if (this.world.hasChunkAt(pos)) {
net.minecraft.world.level.chunk.LevelChunk chunk = this.world.getChunkAt(pos);
@@ -2316,6 +2322,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2289,6 +2294,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public void sendGameEvent(Entity sourceEntity, org.bukkit.GameEvent gameEvent, Vector position) {
@@ -604,7 +596,7 @@ index 56453454cbd4b9e9270fc833f8ab38d5fa7a3763..ad507c36d89ce8639fbedbb1df0da66b
// Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index a1ffd977d605c9280622b4438f136857421d0416..cfc3377c696c7be733bb9a8c83c9931ff7ac3564 100644
index 80bb0371eed48dbcb0e4e62dfc7f23f8514bdf77..fc12bcad034ed4fc97029b83360548f226bc2060 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -951,7 +951,7 @@ public class CraftEventFactory {
@@ -625,7 +617,7 @@ index a1ffd977d605c9280622b4438f136857421d0416..cfc3377c696c7be733bb9a8c83c9931f
Bukkit.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
@@ -2248,7 +2248,7 @@ public class CraftEventFactory {
@@ -2250,7 +2250,7 @@ public class CraftEventFactory {
CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemStack.copyWithCount(1));
org.bukkit.event.block.BlockDispenseEvent event = new org.bukkit.event.block.BlockDispenseEvent(bukkitBlock, craftItem.clone(), CraftVector.toBukkit(to));