34 lines
2 KiB
Diff
34 lines
2 KiB
Diff
From dc9bf7b99878861b221c5ec7208d8fd15cf07259 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/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
index ad4e370..15d161d 100644
|
|
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
@@ -123,7 +123,16 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
|
DedicatedServer.LOGGER.info("Loading properties");
|
|
this.propertyManager = new PropertyManager(this.options); // CraftBukkit - CLI argument support
|
|
this.p = new EULA(new File("eula.txt"));
|
|
- if (!this.p.a()) {
|
|
+ // 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 (!this.p.a() && !eulaAgreed) { // Spigot
|
|
DedicatedServer.LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info.");
|
|
this.p.b();
|
|
return false;
|
|
--
|
|
2.1.4
|
|
|