remove auto-accepting eula

2025-12-19 14:59:25 +00:00 · 2023-06-10 15:04:34 +03:00
parent c0e04a62f1
commit a566e86607
18 changed files with 7 additions and 5 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,8 +4,8 @@ on:
  workflow_dispatch:

 env:
-  version: 1.20
-  branch: ver/1.20
+  version: '1.20'
+  branch: 'ver/1.20'
  debug: 'false'

 jobs:
--- a/patches/removed/1.20/server/0003-Accept-EULA.patch
+++ b/patches/removed/1.20/server/0003-Accept-EULA.patch
@@ -3,6 +3,8 @@ From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
 Date: Mon, 27 Mar 2023 13:16:41 +0300
 Subject: [PATCH] Accept EULA

+I removed this patch, because on new server startup without entering eula=true in eula.txt, server.properties file only contains `eula: true` and no more.
+So this patch was removed.

 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
 index dae36c6452ccd57a436dd918547b64d59957ab0a..023f20b759027302aea7a646f63f335998baf848 100644
--- a/patches/server/0003-Fix-MC-98160-and-MC-105103.patch
+++ b/patches/server/0003-Fix-MC-98160-and-MC-105103.patch
--- a/patches/server/0004-Optimize-default-values-for-configs.patch
+++ b/patches/server/0004-Optimize-default-values-for-configs.patch
--- a/patches/server/0005-Add-missing-purpur-config-options.patch
+++ b/patches/server/0005-Add-missing-purpur-config-options.patch
--- a/patches/server/0006-Fix-MC-93826.patch
+++ b/patches/server/0006-Fix-MC-93826.patch
--- a/patches/server/0007-Fix-entity-serialization.patch
+++ b/patches/server/0007-Fix-entity-serialization.patch
--- a/patches/server/0008-Don-t-save-Fireworks.patch
+++ b/patches/server/0008-Don-t-save-Fireworks.patch
--- a/patches/server/0009-EMC-Allow-negative-Amplifier-values.patch
+++ b/patches/server/0009-EMC-Allow-negative-Amplifier-values.patch
--- a/patches/server/0010-Remove-Spigot-tick-limiter.patch
+++ b/patches/server/0010-Remove-Spigot-tick-limiter.patch
--- a/patches/server/0011-Boat-Settings.patch
+++ b/patches/server/0011-Boat-Settings.patch
--- a/patches/server/0012-Fallback-to-Dimension-if-World-UUID-is-unknown.patch
+++ b/patches/server/0012-Fallback-to-Dimension-if-World-UUID-is-unknown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fallback to Dimension if World UUID is unknown


 diff --git a/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
-index 0a8baeb94ae553c4759b065eafd9e242153cf991..abf8ddccce6ec9d893038d1fafdca617ce0eae4d 100644
+index 9e802fbe8e5f1a3c24cb6bc9254c72a2a0c3fde1..cdf83dc33915632e29291c59eb1841991c03e8a0 100644
 --- a/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
 +++ b/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
@@ -152,4 +152,9 @@ public class DivineConfig {
--- a/patches/server/0013-Allow-any-username.patch
+++ b/patches/server/0013-Allow-any-username.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow any username


 diff --git a/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
-index abf8ddccce6ec9d893038d1fafdca617ce0eae4d..2744315c62f99b48cb689dd90fdfffac405b1bcc 100644
+index cdf83dc33915632e29291c59eb1841991c03e8a0..512afaa97e89e3beb92cf2ebc46248eddd22cf5c 100644
 --- a/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
 +++ b/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
@@ -157,4 +157,9 @@ public class DivineConfig {
--- a/patches/server/0014-Fix-memory-leak.patch
+++ b/patches/server/0014-Fix-memory-leak.patch
--- a/patches/server/0015-Fix-MC-110386.patch
+++ b/patches/server/0015-Fix-MC-110386.patch
--- a/patches/server/0016-Despawn-shulker-bullets-on-owner-death.patch
+++ b/patches/server/0016-Despawn-shulker-bullets-on-owner-death.patch
--- a/patches/server/0017-Fix-MC-31819.patch
+++ b/patches/server/0017-Fix-MC-31819.patch
--- a/patches/todo/server/0026-lithium-collections.goals.patch
+++ b/patches/todo/server/0026-lithium-collections.goals.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] lithium: collections.goals


 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-index 02978315bc2b828cc603ce7478408f3f82c249c2..d8ee71cb3afc0f63669d26c4160f7cd7ed2fd453 100644
+index 8a70bc63e12838f45fa3eade74f2899438715886..93a97455587db28fed1b2fa7ee8063ad08c5120e 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
@@ -13,6 +13,7 @@ import java.util.function.Supplier;