Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@ jobs:
run: ./gradlew createMojmapPaperclipJar

- name: Create Release (development)
if: contains(github.ref, 'dev')
if: "contains(github.ref, 'dev')"
uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "latest-dev"
prerelease: false
prerelease: true
title: "Development Build"
files: |
sparklyslimepaper-server/build/libs/*-paperclip-1.21.8-R0.1-SNAPSHOT-mojmap.jar

- name: Create Release (master)
if: !contains(github.ref, 'dev')
if: "!contains(github.ref, 'dev')"
uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -349,32 +349,34 @@ index 8b5293b0c696ef21d0101493ffa41b60bf0bc86b..6ba713606dafbf5ec19d22b10170571e

diff --git a/src/main/java/net/sparklypower/sparklypaper/ServerLevelTickExecutorThreadFactory.java b/src/main/java/net/sparklypower/sparklypaper/ServerLevelTickExecutorThreadFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..d26d82cb4d120083efc424092a324e5e70122105
index 0000000000000000000000000000000000000000..1f1c80af81603fcf03c16d6820b49350616bdbb1
--- /dev/null
+++ b/src/main/java/net/sparklypower/sparklypaper/ServerLevelTickExecutorThreadFactory.java
@@ -0,0 +1,22 @@
@@ -0,0 +1,24 @@
+package net.sparklypower.sparklypaper;
+
+import ca.spottedleaf.moonrise.common.util.TickThread;
+
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class ServerLevelTickExecutorThreadFactory implements ThreadFactory {
+
+ private final AtomicInteger counter = new AtomicInteger();
+
+ @Override
+ public Thread newThread(Runnable r) {
+ TickThread.ServerLevelTickThread tickThread = new TickThread.ServerLevelTickThread(r, "serverlevel-tick-worker");
+ String name = "Server Level Thread " + counter.getAndIncrement();
+
+ if (tickThread.isDaemon()) {
+ tickThread.setDaemon(false);
+ }
+ TickThread.ServerLevelTickThread tickThread = new TickThread.ServerLevelTickThread(r, name);
+
+ if (tickThread.getPriority() != Thread.MAX_PRIORITY) {
+ tickThread.setPriority(Thread.MAX_PRIORITY);
+ }
+ tickThread.setDaemon(false);
+ tickThread.setPriority(Thread.MAX_PRIORITY);
+
+ return tickThread;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index aa0a61d7f3128543b698647663fa4a9af2a8255a..0faa70d74dee3dd093b77de48dfb6c3564ff3578 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
Expand Down Expand Up @@ -614,7 +616,7 @@ index 6809f9dcf8510c714145d99d250eb69f98d9bf27..e51d306fafad0591562ee3b7da56889d
this.getNMS().tick(level, this.position, level.random);
}
@@ -737,6 +802,11 @@ public class CraftBlock implements Block {

@Override
public void fluidTick() {
+ // SparklyPaper start - parallel world ticking
Expand All @@ -624,7 +626,7 @@ index 6809f9dcf8510c714145d99d250eb69f98d9bf27..e51d306fafad0591562ee3b7da56889d
+ // SparklyPaper end - parallel world ticking
this.getNMSFluid().tick(this.world.getMinecraftWorld(), this.position, this.getNMS());
}

diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
index 5d4faad9df4824cfd61abfd4df011c006f114424..d1227c670db2dbe1816d78be51796c43e99a4d9b 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
Expand Down
Loading