Remove "fix-curing-zombie-villager-discount" exploit option (#9895)

1 files changed, 22 insertions, 0 deletions

diff --git a/patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch
new file mode 100644
index 0000000000..1c9d5aefe4
--- /dev/null
+++ b/patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Warrior <[email protected]>
+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");