mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-07-16 08:35:02 +02:00
ff560e687c
* Update build.yml
* Remove 3rd party patches
* Add Upsteam Submodules
* Fix patches
* ?
* Fix patches
* Add Fast Init script
* Lots of stuff
also it's broke
* more broken
* fixes
* mor stuff
* gfhfgh
hg
* fix patch
* fix up script
* update submodule
* add papercut
* update tuinity
* update gitmodules
* fix var name
* fix more var stuff
* some how it's not deleting shit anymore
* should now use the branch it just made
why are we doing this again?
* now it does thing thing
* return previous so YAPFA can use it
* ok now it really does the thing
* for REAL it does the thing
* don't do the thing because it causes too many problems
* fix api
* work
* use better patching for YAPFA patches
* fix better patching
* more fixes
* new patches stuff
* remove old 3rd parry patches add removed akarin patches
* make new branch for making patches
* hopefully build patches correctly
* fix gitignore and add config patches
* remove papercut files
* fix some weirdness
* fix bug
* time to do some fixin' 👀
* New Patch System Rebased Patches
* fix full build
* exit 1
* fix
* Remove patch
* Hopefully fix compile errors
* fixes
* this might work
* don't use rej for our patches
* tmp disable cache
* some times case sensitivity is dumb
* my sanity is at an all time low :)
* dfg
* readd cahce
* fix?
* Update Upstream
* fix perms
* fix
* fix api
* Redo API
* rm folders
* fix villager brain patch
* emc explosion pref
* fixed aikar's shit
* betterfix
* fix lagggg
* Origami
* Origami Fixes
* Update readme
* test async path finding
* WIP Async Path Finding
* WIP fix async path finding
* same as bellow
* same
* update to newer funcs
* fix newer funcs
* fix author
* Updates, Fixes, and new patches
* fixes
* possibly async flying path finding
* minor asnyc pathfinding fix
* test remove non asnyc path finder
* WIP make all path finding async
* Rename everything
* Exec flag
* Rebuild hashes
* remove dupe patch
* fix?
* Fix packages, redirect config
* old nav class is now async and back
* add getchatcolor.getbyid and handle patches with a . in them better
Co-authored-by: tr7zw <tr7zw@live.de>
Co-authored-by: Unknown <unknown@example.com>
Co-authored-by: Ovydux <68059159+Ovydux@users.noreply.github.com>
54 lines
1.6 KiB
Diff
54 lines
1.6 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..e70da06948abf2aa2223a037aeb5f58fb0a466e3 100644
|
|
--- a/src/main/java/net/minecraft/server/EULA.java
|
|
+++ b/src/main/java/net/minecraft/server/EULA.java
|
|
@@ -1,9 +1,11 @@
|
|
package net.minecraft.server;
|
|
|
|
+import java.io.File;
|
|
import java.io.InputStream;
|
|
import java.io.OutputStream;
|
|
import java.nio.file.Files;
|
|
import java.util.Properties;
|
|
+
|
|
import org.apache.logging.log4j.LogManager;
|
|
import org.apache.logging.log4j.Logger;
|
|
|
|
@@ -15,12 +17,27 @@ 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
|
|
+ }
|
|
+
|
|
+ // Yatopia start
|
|
+
|
|
+ private boolean globalEula() {
|
|
+ File globalEula = new 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;
|
|
}
|
|
|
|
- private boolean b() {
|
|
+ // 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;
|