mirror of
https://hub.spigotmc.org/stash/scm/spigot/spigot.git
synced 2024-11-24 15:16:26 +00:00
35 lines
1.8 KiB
Diff
35 lines
1.8 KiB
Diff
From f5a077d4694156c778778930de5d1cb7d45a3d59 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <git@md-5.net>
|
|
Date: Wed, 9 Jul 2014 10:35:44 +1000
|
|
Subject: [PATCH] Add CommandLine EULA Flag
|
|
|
|
This flag contains the same message as eula.txt (albeit with proper grammar for 3rd person plural). By setting this flag you are agreeing to the terms listed in the message printed upon setting this flag, which are no different from those agreed to by any other method.
|
|
|
|
This feature only exists for hosting companies and people who manage servers in bulk who wish to agree to the terms by setting a flag in a script.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
|
|
index a300a02757..c5115fa9d7 100644
|
|
--- a/src/main/java/net/minecraft/server/Main.java
|
|
+++ b/src/main/java/net/minecraft/server/Main.java
|
|
@@ -150,7 +150,16 @@ public class Main {
|
|
return;
|
|
}
|
|
|
|
- if (!eula.hasAgreedToEULA()) {
|
|
+ // Spigot Start
|
|
+ boolean eulaAgreed = Boolean.getBoolean( "com.mojang.eula.agree" );
|
|
+ if ( eulaAgreed )
|
|
+ {
|
|
+ System.err.println( "You have used the Spigot command line EULA agreement flag." );
|
|
+ System.err.println( "By using this setting you are indicating your agreement to Mojang's EULA (https://account.mojang.com/documents/minecraft_eula)." );
|
|
+ System.err.println( "If you do not agree to the above EULA please stop your server and remove this flag immediately." );
|
|
+ }
|
|
+ // Spigot End
|
|
+ if (!eula.hasAgreedToEULA() && !eulaAgreed) { // Spigot
|
|
Main.LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info.");
|
|
return;
|
|
}
|
|
--
|
|
2.47.0
|
|
|