43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: tr7zw <tr7zw@live.de>
|
|
Date: Sat, 25 Jul 2020 17:16:18 +0200
|
|
Subject: [PATCH] Global Eula file
|
|
|
|
Original code by YatopiaMC, licensed under MIT
|
|
You can find the original code on https://github.com/YatopiaMC/Yatopia
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Eula.java b/src/main/java/net/minecraft/server/Eula.java
|
|
index 30599028f6263fbf61ab95d68573073426db19db..9e169c96fa1bc9dea9efb27cb996b4dd5d2a4c0c 100644
|
|
--- a/src/main/java/net/minecraft/server/Eula.java
|
|
+++ b/src/main/java/net/minecraft/server/Eula.java
|
|
@@ -16,12 +16,26 @@ public class Eula {
|
|
|
|
public Eula(Path eulaFile) {
|
|
this.file = eulaFile;
|
|
- this.agreed = SharedConstants.IS_RUNNING_IN_IDE || this.readFile();
|
|
+ this.agreed = SharedConstants.IS_RUNNING_IN_IDE || globalEula() || this.readFile(eulaFile);
|
|
}
|
|
|
|
- private boolean readFile() {
|
|
+ // Yatopia start - global eula file
|
|
+ private boolean globalEula() {
|
|
+ java.io.File globalEula = new java.io.File(System.getProperty("user.home"), "eula.txt");
|
|
+
|
|
+ if (globalEula.exists()) {
|
|
+ System.out.println("Loaded global eula file from " + globalEula.getAbsolutePath());
|
|
+ return readFile(globalEula.toPath());
|
|
+ } else {
|
|
+ System.out.println("No global eula file found at " + globalEula.getAbsolutePath());
|
|
+ }
|
|
+ return false;
|
|
+ }
|
|
+ // Yatopia end
|
|
+
|
|
+ private boolean readFile(java.nio.file.Path path) {
|
|
try {
|
|
- InputStream inputStream = Files.newInputStream(this.file);
|
|
+ InputStream inputStream = Files.newInputStream(path);
|
|
|
|
boolean var3;
|
|
try {
|