Skip to content

Commit 6301a5f

Browse files
authored
Workflow & Threading changes (#4)
* Update upstream to 1.21.8 * Update patches * Fix compile * Rename tick threads * Update workflow * Set dev build as pre-release
1 parent b3a36b8 commit 6301a5f

2 files changed

Lines changed: 16 additions & 14 deletions

File tree

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ jobs:
3333
run: ./gradlew createMojmapPaperclipJar
3434

3535
- name: Create Release (development)
36-
if: contains(github.ref, 'dev')
36+
if: "contains(github.ref, 'dev')"
3737
uses: "marvinpinto/action-automatic-releases@latest"
3838
with:
3939
repo_token: "${{ secrets.GITHUB_TOKEN }}"
4040
automatic_release_tag: "latest-dev"
41-
prerelease: false
41+
prerelease: true
4242
title: "Development Build"
4343
files: |
4444
sparklyslimepaper-server/build/libs/*-paperclip-1.21.8-R0.1-SNAPSHOT-mojmap.jar
4545
4646
- name: Create Release (master)
47-
if: !contains(github.ref, 'dev')
47+
if: "!contains(github.ref, 'dev')"
4848
uses: "marvinpinto/action-automatic-releases@latest"
4949
with:
5050
repo_token: "${{ secrets.GITHUB_TOKEN }}"

sparklyslimepaper-server/paper-patches/features/0003-Parallel-World-Ticking.patch

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -349,32 +349,34 @@ index 8b5293b0c696ef21d0101493ffa41b60bf0bc86b..6ba713606dafbf5ec19d22b10170571e
349349

350350
diff --git a/src/main/java/net/sparklypower/sparklypaper/ServerLevelTickExecutorThreadFactory.java b/src/main/java/net/sparklypower/sparklypaper/ServerLevelTickExecutorThreadFactory.java
351351
new file mode 100644
352-
index 0000000000000000000000000000000000000000..d26d82cb4d120083efc424092a324e5e70122105
352+
index 0000000000000000000000000000000000000000..1f1c80af81603fcf03c16d6820b49350616bdbb1
353353
--- /dev/null
354354
+++ b/src/main/java/net/sparklypower/sparklypaper/ServerLevelTickExecutorThreadFactory.java
355-
@@ -0,0 +1,22 @@
355+
@@ -0,0 +1,24 @@
356356
+package net.sparklypower.sparklypaper;
357357
+
358358
+import ca.spottedleaf.moonrise.common.util.TickThread;
359359
+
360360
+import java.util.concurrent.ThreadFactory;
361+
+import java.util.concurrent.atomic.AtomicInteger;
361362
+
362363
+public class ServerLevelTickExecutorThreadFactory implements ThreadFactory {
364+
+
365+
+ private final AtomicInteger counter = new AtomicInteger();
366+
+
363367
+ @Override
364368
+ public Thread newThread(Runnable r) {
365-
+ TickThread.ServerLevelTickThread tickThread = new TickThread.ServerLevelTickThread(r, "serverlevel-tick-worker");
369+
+ String name = "Server Level Thread " + counter.getAndIncrement();
366370
+
367-
+ if (tickThread.isDaemon()) {
368-
+ tickThread.setDaemon(false);
369-
+ }
371+
+ TickThread.ServerLevelTickThread tickThread = new TickThread.ServerLevelTickThread(r, name);
370372
+
371-
+ if (tickThread.getPriority() != Thread.MAX_PRIORITY) {
372-
+ tickThread.setPriority(Thread.MAX_PRIORITY);
373-
+ }
373+
+ tickThread.setDaemon(false);
374+
+ tickThread.setPriority(Thread.MAX_PRIORITY);
374375
+
375376
+ return tickThread;
376377
+ }
377378
+}
379+
\ No newline at end of file
378380
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
379381
index aa0a61d7f3128543b698647663fa4a9af2a8255a..0faa70d74dee3dd093b77de48dfb6c3564ff3578 100644
380382
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -614,7 +616,7 @@ index 6809f9dcf8510c714145d99d250eb69f98d9bf27..e51d306fafad0591562ee3b7da56889d
614616
this.getNMS().tick(level, this.position, level.random);
615617
}
616618
@@ -737,6 +802,11 @@ public class CraftBlock implements Block {
617-
619+
618620
@Override
619621
public void fluidTick() {
620622
+ // SparklyPaper start - parallel world ticking
@@ -624,7 +626,7 @@ index 6809f9dcf8510c714145d99d250eb69f98d9bf27..e51d306fafad0591562ee3b7da56889d
624626
+ // SparklyPaper end - parallel world ticking
625627
this.getNMSFluid().tick(this.world.getMinecraftWorld(), this.position, this.getNMS());
626628
}
627-
629+
628630
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
629631
index 5d4faad9df4824cfd61abfd4df011c006f114424..d1227c670db2dbe1816d78be51796c43e99a4d9b 100644
630632
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java

0 commit comments

Comments
 (0)