Several fixes and new api for experience merging/stacking (#9242)

2024-05-29 13:58:57 -07:00 · 2024-05-29 13:58:57 -07:00 · a31dc90741
commit a31dc90741
parent ed85aac53c
693 changed files with 318 additions and 240 deletions
--- a/patches/server/0832-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0832-Fix-demo-flag-not-enabling-demo-mode.patch
@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
+Date: Fri, 7 Apr 2023 20:11:17 +0200
+Subject: [PATCH] Fix demo flag not enabling demo mode
+
+https://github.com/PaperMC/Paper/issues/9046
+
+diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
+index 13e1a914d4523f1c192db2a9a1ee6522e0ee27da..c33f85b570f159ab465b5a10a8044a81f2797f43 100644
+--- a/src/main/java/net/minecraft/server/Main.java
+++ b/src/main/java/net/minecraft/server/Main.java
+@@ -325,7 +325,9 @@ public class Main {
+ 
+                 /*
+                 dedicatedserver1.setPort((Integer) optionset.valueOf(optionspec11));
+-                dedicatedserver1.setDemo(optionset.has(optionspec2));
+                */
+                dedicatedserver1.setDemo(optionset.has("demo")); // Paper
+                /*
+                 dedicatedserver1.setId((String) optionset.valueOf(optionspec12));
+                 */
+                 boolean flag2 = !optionset.has("nogui") && !optionset.nonOptionArguments().contains("nogui");