Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2025-02-09 08:51:42 +01:00
Code Issues Projects Releases Wiki Activity

This is what happens when you don't triple check

Browse Source
This commit is contained in:
Ivan Pekov 2020-09-12 09:31:53 +03:00
parent 67f9aea916
commit 57bf138aec
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
patches/server/0001-Yatopia-Server-Fixes.patch
View File

@ -106,7 +106,7 @@ index e0af5eb280dfd2ef6c9a80385e1705f7231a5338..f6623032e5d4034c104aa1fc6ff42651
brandName = getString("brand-name", brandName);
}
diff --git a/src/main/java/de/minebench/origami/OrigamiConfig.java b/src/main/java/de/minebench/origami/OrigamiConfig.java
index fe7330fabe386966c2d203a190a00a785ea21be0..8b2fdef3abd4eb50e72d75828fbd975e9bda15e0 100644
index fe7330fabe386966c2d203a190a00a785ea21be0..9480b7ce6ae769f5dfec258ba2c7efbf165b5ce6 100644
--- a/src/main/java/de/minebench/origami/OrigamiConfig.java
+++ b/src/main/java/de/minebench/origami/OrigamiConfig.java
@@ -16,7 +16,7 @@ public final class OrigamiConfig {
@ -118,11 +118,16 @@ index fe7330fabe386966c2d203a190a00a785ea21be0..8b2fdef3abd4eb50e72d75828fbd975e
private static int configVersion;
public static void init(final File file) {
@@ -112,6 +112,16 @@ public final class OrigamiConfig {
@@ -112,6 +112,21 @@ public final class OrigamiConfig {
config.addDefault("worlds.default." + path, Double.valueOf(dfl));
return config.getDouble("worlds." + worldName + "." + path, config.getDouble("worlds.default." + path, dfl));
}
+
+ public boolean fastFeatureSearchDontLoad = false;
+ private void fastFeatureSearchDontLoad() {
+ fastFeatureSearchDontLoad = getBoolean("fast-feature-search-dont-load", false);
+ }
+
+ public boolean pigmenDontTargetUnlessHit = false;
+ private void pigmenDontTargetUnlessHit() {
+ pigmenDontTargetUnlessHit = getBoolean("pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit);

4
patches/server/0007-Per-entity-type-collision-settings.patch
View File

@ -14,10 +14,10 @@ The whole code is based around 1 class, the EntityFilter class. Whole filtering
Co-authored-by: tr7zw <tr7zw@live.de>
diff --git a/src/main/java/de/minebench/origami/OrigamiConfig.java b/src/main/java/de/minebench/origami/OrigamiConfig.java
index 8b2fdef3abd4eb50e72d75828fbd975e9bda15e0..a8f9733893a3f1bc9ae579c20f2e33ac59225e50 100644
index 9480b7ce6ae769f5dfec258ba2c7efbf165b5ce6..bbf09800b7b72bdfb75c91e4c6c77fe00e3ad436 100644
--- a/src/main/java/de/minebench/origami/OrigamiConfig.java
+++ b/src/main/java/de/minebench/origami/OrigamiConfig.java
@@ -122,6 +122,39 @@ public final class OrigamiConfig {
@@ -127,6 +127,39 @@ public final class OrigamiConfig {
private void observerClock() {
disableObserverClocks = getBoolean("disable-observer-clocks", disableObserverClocks);
}

2
patches/server/0023-Redirect-Configs.patch
View File

@ -32,7 +32,7 @@ index f6623032e5d4034c104aa1fc6ff4265169e462ba..4bc94e4598cff801d08e457ebbf184fb
protected static void logError(String s) {
diff --git a/src/main/java/de/minebench/origami/OrigamiConfig.java b/src/main/java/de/minebench/origami/OrigamiConfig.java
index a8f9733893a3f1bc9ae579c20f2e33ac59225e50..58bc509119847f42d96470285c9f5ffd69246771 100644
index bbf09800b7b72bdfb75c91e4c6c77fe00e3ad436..1d98bfdee95fb1052fcd9f141a2ab82ba9dcf2f9 100644
--- a/src/main/java/de/minebench/origami/OrigamiConfig.java
+++ b/src/main/java/de/minebench/origami/OrigamiConfig.java
@@ -1,5 +1,6 @@

4
patches/server/0031-Use-block-distance-in-portal-search-radius.patch
View File

@ -12,10 +12,10 @@ This changes it so that the portal list is filtered to only include portals with
Ported to Yatopia and added per world config option by MrIvanPlays <ivan@mrivanplays.com>
diff --git a/src/main/java/de/minebench/origami/OrigamiConfig.java b/src/main/java/de/minebench/origami/OrigamiConfig.java
index 58bc509119847f42d96470285c9f5ffd69246771..5b834624f1bdd2d4096179d48d09e813e91de5ae 100644
index 1d98bfdee95fb1052fcd9f141a2ab82ba9dcf2f9..9549b857020bb749c039420950684c74c1108945 100644
--- a/src/main/java/de/minebench/origami/OrigamiConfig.java
+++ b/src/main/java/de/minebench/origami/OrigamiConfig.java
@@ -160,6 +160,11 @@ public final class OrigamiConfig {
@@ -165,6 +165,11 @@ public final class OrigamiConfig {
&& pillagerCollisions && ironGolemCollisions && miscCollisions && itemCollisions
&& waterCreatureCollisions && waterAmbientCollisions;
}