mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-09-12 23:58:20 +02:00
784079fc31
* Drop useless stuff * Faster Random * TE opts * Patches.md * More Faster Random * Fix Build * More Opts * AirplaneLite * Update README.md removed TIC-TACS and adding AirplaneLite * Add AirplaneLite to the update script * Rebuild patches * Make enchanting table ticking configurable * AirplaneLite to commitUpstream.sh * Use FastRandom on more places Co-authored-by: Bud Gidiere <sgidiere@gmail.com> Co-authored-by: Simon Gardling <Titaniumtown@gmail.com>
40 lines
1.4 KiB
Diff
40 lines
1.4 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
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
|
|
index 229c3b0f0c650b501f31147adaa17194af57fedd..345f8b811946fd11695dd718d060c5a86cd64703 100644
|
|
--- a/src/main/java/net/minecraft/server/EULA.java
|
|
+++ b/src/main/java/net/minecraft/server/EULA.java
|
|
@@ -15,12 +15,25 @@ public class EULA {
|
|
|
|
public EULA(java.nio.file.Path java_nio_file_path) {
|
|
this.b = java_nio_file_path;
|
|
- this.c = SharedConstants.d || this.b();
|
|
+ this.c = SharedConstants.d || globalEula() || this.b(this.b); // Yatopia
|
|
}
|
|
|
|
- private boolean b() {
|
|
+ // Yatopia start
|
|
+ private boolean globalEula() {
|
|
+ java.io.File globalEula = new java.io.File(System.getProperty("user.home"), "eula.txt");
|
|
+
|
|
+ if (globalEula.exists()) {
|
|
+ return b(globalEula.toPath());
|
|
+ } else {
|
|
+ System.out.println("No global eula found at " + globalEula.getAbsolutePath());
|
|
+ }
|
|
+ return false;
|
|
+ }
|
|
+ // Yatopia end
|
|
+
|
|
+ private boolean b(java.nio.file.Path path) { // Yatopia
|
|
try {
|
|
- InputStream inputstream = Files.newInputStream(this.b);
|
|
+ InputStream inputstream = Files.newInputStream(path);
|
|
Throwable throwable = null;
|
|
|
|
boolean flag;
|