mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Prepare for 1.20.3 dev

Browse source
This commit is contained in:
Nassim Jahnke 2023-12-05 18:20:55 +01:00
parent 931781c220
commit 2a1ace0cf2
1514 changed files with 528 additions and 530 deletions
Download patch file Download diff file Expand all files Collapse all files

22
patches/unapplied/server/0933-Fix-demo-flag-not-enabling-demo-mode.patch Normal file
View file

@ -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 ae0e39461e416cecd8e6904cb2fa69ad55a510e1..ec268189b19b6fa5c4521f96ce211a531db35ec5 100644
--- a/src/main/java/net/minecraft/server/Main.java
+++ b/src/main/java/net/minecraft/server/Main.java
@@ -308,7 +308,9 @@ public class Main {
/*
dedicatedserver1.setPort((Integer) optionset.valueOf(optionspec10));
- dedicatedserver1.setDemo(optionset.has(optionspec2));
+ */
+ dedicatedserver1.setDemo(optionset.has("demo")); // Paper - Restore setting the demo mode
+ /*
dedicatedserver1.setId((String) optionset.valueOf(optionspec11));
*/
boolean flag1 = !optionset.has("nogui") && !optionset.nonOptionArguments().contains("nogui");