mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-09-28 15:17:45 +02:00
Fix patches/config stuff
This commit is contained in:
parent
16690df3b6
commit
f733a06f98
@ -1 +1 @@
|
||||
Ban-certain-plugins&Apply-advancements-async&Optimize-Pathfinder-Remove-Streams-Optimized-collect&Optimize-redstone-algorithm&Async-navigation
|
||||
Add-Rainforest-config&Ban-certain-plugins&Apply-advancements-async&Add-more-dupe-options&Optimize-Pathfinder-Remove-Streams-Optimized-collect&Optimize-redstone-algorithm&Async-navigation
|
@ -3,7 +3,7 @@ From: Bud Gidiere <sgidiere@gmail.com>
|
||||
Date: Sat, 1 Aug 2020 15:51:06 -0500
|
||||
Subject: [PATCH] Yatopia API Bundle
|
||||
|
||||
Lagging threshold + Purpur & Papercut & Origami config
|
||||
Lagging threshold + Purpur & Rainforest & Origami config
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 62cc1c74c11f56dcbd1e24e9c5478497742e6351..0770736b4b52f325027671b43f74ad038c97ce7f 100644
|
||||
@ -26,19 +26,21 @@ index 62cc1c74c11f56dcbd1e24e9c5478497742e6351..0770736b4b52f325027671b43f74ad03
|
||||
+ // Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 1f916988bd54e8386011b0d7e82fc9219939a881..6ff5c73f607d1c1a3bc392fda2c0e8b492aab579 100644
|
||||
index 1f916988bd54e8386011b0d7e82fc9219939a881..154c24a5a32450636b1c554df1bb5262fa05e9c8 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1463,6 +1463,31 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1463,6 +1463,33 @@ public interface Server extends PluginMessageRecipient {
|
||||
}
|
||||
// Akarin end - Server config
|
||||
|
||||
+ // Papercut start
|
||||
+ // Rainforest start
|
||||
+ @NotNull
|
||||
+ public org.bukkit.configuration.file.YamlConfiguration getPapercutConfig()
|
||||
+ public org.bukkit.configuration.file.YamlConfiguration getRainforestConfig()
|
||||
+ {
|
||||
+ throw new UnsupportedOperationException("Not supported yet.");
|
||||
+ }
|
||||
+ // Rainforest end
|
||||
+
|
||||
+ // Purpur start
|
||||
+ @NotNull
|
||||
+ public org.bukkit.configuration.file.YamlConfiguration getPurpurConfig() {
|
||||
@ -61,7 +63,7 @@ index 1f916988bd54e8386011b0d7e82fc9219939a881..6ff5c73f607d1c1a3bc392fda2c0e8b4
|
||||
/**
|
||||
* Sends the component to the player
|
||||
*
|
||||
@@ -1563,4 +1588,13 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1563,4 +1590,13 @@ public interface Server extends PluginMessageRecipient {
|
||||
@NotNull
|
||||
com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
|
||||
// Paper end
|
||||
|
@ -20,10 +20,10 @@ index 0770736b4b52f325027671b43f74ad038c97ce7f..537e7fc9273b7e4ecc88eaad5b1a69d3
|
||||
+ // Yatopia end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 6ff5c73f607d1c1a3bc392fda2c0e8b492aab579..09a710dd500e404b382e75b62f1f2533da270ff3 100644
|
||||
index 154c24a5a32450636b1c554df1bb5262fa05e9c8..1eb935b3ba88918f04a075d47b0f514ddc8f2499 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1597,4 +1597,13 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1599,4 +1599,13 @@ public interface Server extends PluginMessageRecipient {
|
||||
*/
|
||||
boolean isLagging();
|
||||
// Purpur end
|
||||
|
@ -1,358 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: tsao chi <tsao-chi@the-lingo.org>
|
||||
Date: Sun, 2 Aug 2020 12:25:52 -0500
|
||||
Subject: [PATCH] Akarin updated Async Path Finding
|
||||
|
||||
Co-authored-by: Bud Gidiere <sgidiere@gmail.com>
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
|
||||
index e6868e2b65e3c2bde7696272b242a47e7394e27f..c4c3ef500b9b8465644a0b7712f43ba35ad3acc1 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityBee.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityBee.java
|
||||
@@ -445,9 +445,9 @@ public class EntityBee extends EntityAnimal implements IEntityAngerable, EntityB
|
||||
}
|
||||
|
||||
@Override
|
||||
- public void c() {
|
||||
+ public void tickAsync() {
|
||||
if (!EntityBee.this.bJ.k()) {
|
||||
- super.c();
|
||||
+ super.tickAsync();
|
||||
}
|
||||
}
|
||||
};
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
index 027a55223c660f25b0b52f99efed5b0c037ae658..09f332aa02604dd86224a6f66ec4f84d7bf99318 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
@@ -757,7 +757,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
this.goalSelector.doTick();
|
||||
//this.world.getMethodProfiler().exit(); // Akarin - remove caller
|
||||
//this.world.getMethodProfiler().enter("navigation"); // Akarin - remove caller
|
||||
- this.navigation.c();
|
||||
+ this.navigation.tickAsync(); // Akarin - Async pathfinder
|
||||
//this.world.getMethodProfiler().exit(); // Akarin - remove caller
|
||||
//this.world.getMethodProfiler().enter("mob tick"); // Akarin - remove caller
|
||||
this.mobTick();
|
||||
diff --git a/src/main/java/net/minecraft/server/Navigation.java b/src/main/java/net/minecraft/server/Navigation.java
|
||||
index 681465d8a74831461dce4615d2d19c7ed46bc299..f04411a2a295d2a982dca5851ae76a80a6a83585 100644
|
||||
--- a/src/main/java/net/minecraft/server/Navigation.java
|
||||
+++ b/src/main/java/net/minecraft/server/Navigation.java
|
||||
@@ -183,7 +183,7 @@ public class Navigation extends NavigationAbstract {
|
||||
double d3 = (double) j2 + 0.5D - vec3d.z;
|
||||
|
||||
if (d2 * d0 + d3 * d1 >= 0.0D) {
|
||||
- PathType pathtype = this.o.a(this.b, i2, j - 1, j2, this.a, l, i1, j1, true, true);
|
||||
+ PathType pathtype = this.o.a(this.o.a, i2, j - 1, j2, this.a, l, i1, j1, true, true); // Akarin - use chunk cache
|
||||
|
||||
if (!this.a(pathtype)) {
|
||||
return false;
|
||||
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
||||
index 2405dc5e9a6a971a565c37710b61d5fc4737bdf8..2dac507e9e0044a32ae54ea57eada0de04c1467d 100644
|
||||
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
|
||||
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
||||
@@ -28,6 +28,15 @@ public abstract class NavigationAbstract {
|
||||
private int q;
|
||||
private float r;
|
||||
private final Pathfinder s; public Pathfinder getPathfinder() { return this.s; } // Paper - OBFHELPER
|
||||
+ // Akarin start - Async pathfinder
|
||||
+ private long lastPathfindAsync;
|
||||
+ private static final java.util.concurrent.ExecutorService pathfindExecutor =
|
||||
+ java.util.concurrent.Executors.newSingleThreadExecutor(
|
||||
+ new com.google.common.util.concurrent.ThreadFactoryBuilder()
|
||||
+ .setDaemon(true)
|
||||
+ .setNameFormat("StarLink Pathfinder - %d")
|
||||
+ .build());
|
||||
+ // Akarin end
|
||||
|
||||
// Tuinity start
|
||||
public boolean isViableForPathRecalculationChecking() {
|
||||
@@ -83,7 +92,40 @@ public abstract class NavigationAbstract {
|
||||
}
|
||||
|
||||
}
|
||||
+ // Akarin start - Async pathfinder, copied from above with modification
|
||||
+ public void doPathfindAsync() {
|
||||
+ if (this.b.getTime() - this.lastPathfindAsync > 20L) {
|
||||
+ if (this.p != null) {
|
||||
+ this.lastPathfindAsync = this.b.getTime();
|
||||
+
|
||||
+ // Bake chunk cache
|
||||
+ float f = (float) this.a.b(GenericAttributes.FOLLOW_RANGE);;
|
||||
+ BlockPosition blockposition = this.a.getChunkCoordinates();
|
||||
+ int k = (int) (f + (float) 8);
|
||||
+ ChunkCache cache = new ChunkCache(this.b, blockposition.b(-k, -k, -k), blockposition.b(k, k, k));
|
||||
+
|
||||
+ // Execute directly if we already have a path entity, or compute one
|
||||
+ if (this.c != null && !this.c.b()) {
|
||||
+ doTickAsync(this.c);
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
+ pathfindExecutor.execute(() -> {
|
||||
+ PathEntity result = findPathAsync(cache, java.util.Collections.singleton(this.p), this.q);
|
||||
+ NavigationAbstract.this.b.getMinecraftServer().processQueue.add(() -> {
|
||||
+ if (result != null && result.m() != null)
|
||||
+ this.p = result.m();
|
||||
+
|
||||
+ NavigationAbstract.this.c = result;
|
||||
+ });
|
||||
+ });
|
||||
+ }
|
||||
+ } else {
|
||||
+ // Execute directly, keep behaviour with vanilla, see the original doTick method
|
||||
+ doTickAsync(this.c);
|
||||
+ }
|
||||
+ }
|
||||
+ // Akarin end
|
||||
@Nullable
|
||||
public final PathEntity calculateDestination(double d0, double d1, double d2) { return a(d0, d1, d2, 0); } public final PathEntity a(double d0, double d1, double d2, int i) { // Paper - OBFHELPER
|
||||
return this.a(new BlockPosition(d0, d1, d2), i);
|
||||
@@ -164,7 +206,17 @@ public abstract class NavigationAbstract {
|
||||
return pathentity;
|
||||
}
|
||||
}
|
||||
-
|
||||
+ // Akarin start - Async pathfinder, copied and edited from above with only pathfinding
|
||||
+ protected PathEntity findPathAsync(ChunkCache cache, Set<BlockPosition> set, int j) {
|
||||
+ if (this.a.locY() < 0.0D) {
|
||||
+ return null;
|
||||
+ } else if (!this.a()) {
|
||||
+ return null;
|
||||
+ } else {
|
||||
+ return this.s.a(cache, this.a, set, f, j, this.r);
|
||||
+ }
|
||||
+ }
|
||||
+ // Akarin end
|
||||
public boolean a(double d0, double d1, double d2, double d3) {
|
||||
return this.a(this.a(d0, d1, d2, 1), d3);
|
||||
}
|
||||
@@ -228,7 +280,7 @@ public abstract class NavigationAbstract {
|
||||
return this.c;
|
||||
}
|
||||
|
||||
- public void c() {
|
||||
+/* public void c() {
|
||||
++this.e;
|
||||
if (this.m) {
|
||||
this.j();
|
||||
@@ -238,7 +290,7 @@ public abstract class NavigationAbstract {
|
||||
Vec3D vec3d;
|
||||
|
||||
if (this.a()) {
|
||||
- this.l();
|
||||
+ //this.l();
|
||||
} else if (this.c != null && this.c.f() < this.c.e()) {
|
||||
vec3d = this.b();
|
||||
Vec3D vec3d1 = this.c.a(this.a, this.c.f());
|
||||
@@ -256,9 +308,44 @@ public abstract class NavigationAbstract {
|
||||
this.a.getControllerMove().a(vec3d.x, this.b.getType(blockposition.down()).isAir() ? vec3d.y : PathfinderNormal.a((IBlockAccess) this.b, blockposition), vec3d.z, this.d);
|
||||
}
|
||||
}
|
||||
+ }*/
|
||||
+ //Yatopia Start
|
||||
+ public void c() {
|
||||
+ this.tickAsync();
|
||||
+ }
|
||||
+ //Yatopia End
|
||||
+ // Akarin start - Async pathfinder, copied from above
|
||||
+ public void tickAsync() {
|
||||
+ ++this.e;
|
||||
+ this.doPathfindAsync();
|
||||
}
|
||||
|
||||
- protected void l() {
|
||||
+ // This was copied from above partly with param
|
||||
+ public void doTickAsync(PathEntity pathEntity) {
|
||||
+ if (shouldContinuePathfind(pathEntity))
|
||||
+ return;
|
||||
+
|
||||
+ Vec3D vec3d;
|
||||
+ if (this.a()) {
|
||||
+ this.applyPath(pathEntity);
|
||||
+ } else if (pathEntity.f() < pathEntity.e()) {
|
||||
+ vec3d = this.b();
|
||||
+ Vec3D vec3d1 = pathEntity.a(this.a, pathEntity.f());
|
||||
+
|
||||
+ if (vec3d.y > vec3d1.y && !this.a.isOnGround() && MathHelper.floor(vec3d.x) == MathHelper.floor(vec3d1.x) && MathHelper.floor(vec3d.z) == MathHelper.floor(vec3d1.z)) {
|
||||
+ pathEntity.c(pathEntity.f() + 1);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (shouldContinuePathfind(pathEntity))
|
||||
+ return;
|
||||
+ //PacketDebug.a(this.b, this.a, pathEntity, this.l);
|
||||
+ vec3d = pathEntity.a((Entity) this.a);
|
||||
+ BlockPosition blockposition = new BlockPosition(vec3d);
|
||||
+
|
||||
+ this.a.getControllerMove().a(vec3d.x, this.b.getType(blockposition.down()).isAir() ? vec3d.y : PathfinderNormal.a((IBlockAccess) this.b, blockposition), vec3d.z, this.d);
|
||||
+ }
|
||||
+/* protected void l() {
|
||||
Vec3D vec3d = this.b();
|
||||
|
||||
this.l = this.a.getWidth() > 0.75F ? this.a.getWidth() / 2.0F : 0.75F - this.a.getWidth() / 2.0F;
|
||||
@@ -273,8 +360,26 @@ public abstract class NavigationAbstract {
|
||||
}
|
||||
|
||||
this.a(vec3d);
|
||||
- }
|
||||
+ }*/
|
||||
+
|
||||
+ // Akarin start - Async pathfinder, copied from above with param
|
||||
+ protected void applyPath(PathEntity pathEntity) {
|
||||
+ Vec3D vec3d = this.b();
|
||||
+
|
||||
+ this.l = this.a.getWidth() > 0.75F ? this.a.getWidth() / 2.0F : 0.75F - this.a.getWidth() / 2.0F;
|
||||
+ BaseBlockPosition baseblockposition = pathEntity.g();
|
||||
+ double d0 = Math.abs(this.a.locX() - ((double) baseblockposition.getX() + 0.5D));
|
||||
+ double d1 = Math.abs(this.a.locY() - (double) baseblockposition.getY());
|
||||
+ double d2 = Math.abs(this.a.locZ() - ((double) baseblockposition.getZ() + 0.5D));
|
||||
+ boolean flag = d0 < (double) this.l && d2 < (double) this.l && d1 < 1.0D;
|
||||
|
||||
+ if (flag || this.a.b(pathEntity.h().l) && this.b(vec3d)) {
|
||||
+ pathEntity.c(pathEntity.f() + 1);
|
||||
+ }
|
||||
+
|
||||
+ this.applyPath0(pathEntity, vec3d);
|
||||
+ }
|
||||
+ // Akarin end
|
||||
private boolean b(Vec3D vec3d) {
|
||||
if (this.c.e() <= this.c.f() + 1) {
|
||||
return false;
|
||||
@@ -324,7 +429,39 @@ public abstract class NavigationAbstract {
|
||||
}
|
||||
|
||||
}
|
||||
+ // Akarin start - Async pathfinder, copied from above with param
|
||||
+ protected void applyPath0(PathEntity pathEntity, Vec3D vec3d) {
|
||||
+ if (this.e - this.f > 100) {
|
||||
+ if (vec3d.distanceSquared(this.g) < 2.25D) {
|
||||
+ this.o();
|
||||
+ }
|
||||
+
|
||||
+ this.f = this.e;
|
||||
+ this.g = vec3d;
|
||||
+ }
|
||||
+
|
||||
+ if (!pathEntity.b()) {
|
||||
+ BaseBlockPosition baseblockposition = pathEntity.g();
|
||||
+
|
||||
+ if (baseblockposition.equals(this.h)) {
|
||||
+ this.i += SystemUtils.getMonotonicMillis() - this.j;
|
||||
+ } else {
|
||||
+ this.h = baseblockposition;
|
||||
+ double d0 = vec3d.f(Vec3D.c(this.h));
|
||||
+
|
||||
+ this.k = this.a.dM() > 0.0F ? d0 / (double) this.a.dM() * 1000.0D : 0.0D;
|
||||
+ }
|
||||
+
|
||||
+ if (this.k > 0.0D && (double) this.i > this.k * 3.0D) {
|
||||
+ this.e();
|
||||
+ this.o();
|
||||
+ }
|
||||
+
|
||||
+ this.j = SystemUtils.getMonotonicMillis();
|
||||
+ }
|
||||
|
||||
+ }
|
||||
+ // Akarin end
|
||||
private void e() {
|
||||
this.h = BaseBlockPosition.ZERO;
|
||||
this.i = 0L;
|
||||
@@ -389,7 +526,11 @@ public abstract class NavigationAbstract {
|
||||
public boolean r() {
|
||||
return this.o.e();
|
||||
}
|
||||
-
|
||||
+ // Akarin start - Async pathfinder, copied from above with param
|
||||
+ public static boolean shouldContinuePathfind(PathEntity pathEntity) {
|
||||
+ return pathEntity == null || pathEntity.b();
|
||||
+ }
|
||||
+ // Akarin end
|
||||
public void b(BlockPosition blockposition) {
|
||||
if (this.c != null && !this.c.b() && this.c.e() != 0) { // Tuinity - diff on change - needed for isViableForPathRecalculationChecking()
|
||||
PathPoint pathpoint = this.c.c();
|
||||
diff --git a/src/main/java/net/minecraft/server/NavigationFlying.java b/src/main/java/net/minecraft/server/NavigationFlying.java
|
||||
index 0c33a0c9d59d79a39826b5ee14144604717ffebe..cf3f4c1a2a89cce0345566a62faa34ef7e93c603 100644
|
||||
--- a/src/main/java/net/minecraft/server/NavigationFlying.java
|
||||
+++ b/src/main/java/net/minecraft/server/NavigationFlying.java
|
||||
@@ -28,7 +28,7 @@ public class NavigationFlying extends NavigationAbstract {
|
||||
return this.a(entity.getChunkCoordinates(), entity, i); // Paper - Forward target entity
|
||||
}
|
||||
|
||||
- @Override
|
||||
+/* @Override
|
||||
public void c() {
|
||||
++this.e;
|
||||
if (this.m) {
|
||||
@@ -53,6 +53,31 @@ public class NavigationFlying extends NavigationAbstract {
|
||||
this.a.getControllerMove().a(vec3d.x, vec3d.y, vec3d.z, this.d);
|
||||
}
|
||||
}
|
||||
+ }*/
|
||||
+
|
||||
+ // This was copied from above partly with param
|
||||
+ @Override
|
||||
+ public void doTickAsync(PathEntity pathEntity) {
|
||||
+ if (shouldContinuePathfind(pathEntity))
|
||||
+ return;
|
||||
+
|
||||
+ Vec3D vec3d;
|
||||
+ if (this.a()) {
|
||||
+ this.applyPath(pathEntity);
|
||||
+ } else if (pathEntity != null && pathEntity.f() < pathEntity.e()) {
|
||||
+ vec3d = pathEntity.a(this.a, pathEntity.f());
|
||||
+ if (MathHelper.floor(this.a.locX()) == MathHelper.floor(vec3d.x) && MathHelper.floor(this.a.locY()) == MathHelper.floor(vec3d.y) && MathHelper.floor(this.a.locZ()) == MathHelper.floor(vec3d.z)) {
|
||||
+ pathEntity.c(pathEntity.f() + 1);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (shouldContinuePathfind(pathEntity))
|
||||
+ return;
|
||||
+ //PacketDebug.a(this.b, this.a, pathEntity, this.l);
|
||||
+ vec3d = pathEntity.a((Entity) this.a);
|
||||
+ BlockPosition blockposition = new BlockPosition(vec3d);
|
||||
+
|
||||
+ this.a.getControllerMove().a(vec3d.x, vec3d.y, vec3d.z, this.d);
|
||||
}
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java
|
||||
index 1c3a8043e735ec4605635efcfc5deb08a35ea1fd..bf2ac046eebd7f88fcb1d953f37952e791e6ea83 100644
|
||||
--- a/src/main/java/net/minecraft/server/Pathfinder.java
|
||||
+++ b/src/main/java/net/minecraft/server/Pathfinder.java
|
||||
@@ -26,7 +26,7 @@ public class Pathfinder {
|
||||
}
|
||||
|
||||
@Nullable
|
||||
- public PathEntity a(ChunkCache chunkcache, EntityInsentient entityinsentient, Set<BlockPosition> set, float f, int i, float f1) {
|
||||
+ public synchronized PathEntity a(ChunkCache chunkcache, EntityInsentient entityinsentient, Set<BlockPosition> set, float f, int i, float f1) { // Akarin - synchronized
|
||||
this.d.a();
|
||||
this.c.a(chunkcache, entityinsentient);
|
||||
PathPoint pathpoint = this.c.b();
|
||||
diff --git a/src/main/java/net/minecraft/server/PathfinderTurtle.java b/src/main/java/net/minecraft/server/PathfinderTurtle.java
|
||||
index cea160885783e8666b616375eac44ba6d1880e1f..9598563b4f97500fd3fba0165813d564d9c96c4f 100644
|
||||
--- a/src/main/java/net/minecraft/server/PathfinderTurtle.java
|
||||
+++ b/src/main/java/net/minecraft/server/PathfinderTurtle.java
|
||||
@@ -148,7 +148,7 @@ public class PathfinderTurtle extends PathfinderNormal {
|
||||
if (pathtype == PathType.OPEN) {
|
||||
AxisAlignedBB axisalignedbb = new AxisAlignedBB((double) i - d2 + 0.5D, (double) j + 0.001D, (double) k - d2 + 0.5D, (double) i + d2 + 0.5D, (double) ((float) j + this.b.getHeight()), (double) k + d2 + 0.5D);
|
||||
|
||||
- if (!this.b.world.getCubes(this.b, axisalignedbb)) {
|
||||
+ if (!this.a.getCubes(this.b, axisalignedbb)) { // Akarin - use chunk cache
|
||||
return null;
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PathfinderWater.java b/src/main/java/net/minecraft/server/PathfinderWater.java
|
||||
index fba6692a1e537b90e20aa448567c0ad6db653332..d576edc8c30288e98aeda8f1cb561b22c6b37536 100644
|
||||
--- a/src/main/java/net/minecraft/server/PathfinderWater.java
|
||||
+++ b/src/main/java/net/minecraft/server/PathfinderWater.java
|
||||
@@ -63,7 +63,7 @@ public class PathfinderWater extends PathfinderAbstract {
|
||||
@Override
|
||||
protected PathPoint a(int i, int j, int k) {
|
||||
PathPoint pathpoint = null;
|
||||
- PathType pathtype = this.a(this.b.world, i, j, k);
|
||||
+ PathType pathtype = this.a(this.a, i, j, k); // Akarin - use chunk cache
|
||||
float f = this.b.a(pathtype);
|
||||
|
||||
if (f >= 0.0F) {
|
@ -1,21 +1,37 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Bud Gidiere <sgidiere@gmail.com>
|
||||
Date: Tue, 4 Aug 2020 19:15:55 -0500
|
||||
Date: Wed, 5 Aug 2020 08:01:22 -0500
|
||||
Subject: [PATCH] Yatopia Server Fixes
|
||||
|
||||
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
|
||||
index 841a8d2b392acdcef90592b841cbbcb2237c6901..ff2351b57e96c8c17701a0608c9f2596d0adae6e 100644
|
||||
index 841a8d2b392acdcef90592b841cbbcb2237c6901..1fbbc17f0aa2fc505b87840ffe91ff9a7b4a56fe 100644
|
||||
--- a/src/main/java/co/aikar/timings/TimingsExport.java
|
||||
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
|
||||
@@ -232,6 +232,7 @@ public class TimingsExport extends Thread {
|
||||
@@ -232,6 +232,8 @@ public class TimingsExport extends Thread {
|
||||
pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
|
||||
pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)) // Tuinity - add config to timings report
|
||||
, pair("akarin", mapAsJSON(Bukkit.spigot().getAkarinConfig(), null)) // Akarin - Server config
|
||||
+ , pair("origami", mapAsJSON(Bukkit.spigot().getOrigamiConfig(), null)) // Origami
|
||||
+ , pair("rainforest", mapAsJSON(Bukkit.spigot().getRainforestConfig(), null)) // Rainforest
|
||||
));
|
||||
|
||||
new TimingsExport(listeners, parent, history).start();
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java.rej b/src/main/java/co/aikar/timings/TimingsExport.java.rej
|
||||
deleted file mode 100644
|
||||
index 572780ca665c0fb254cc7431af3dd7759a94f26c..0000000000000000000000000000000000000000
|
||||
--- a/src/main/java/co/aikar/timings/TimingsExport.java.rej
|
||||
+++ /dev/null
|
||||
@@ -1,9 +0,0 @@
|
||||
-diff a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java (rejected hunks)
|
||||
-@@ -230,6 +230,7 @@ public class TimingsExport extends Thread {
|
||||
- pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
|
||||
- pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
|
||||
- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
|
||||
-+ , pair("rainforest", mapAsJSON(Bukkit.spigot().getRainforestConfig(), null)) // Rainforest
|
||||
- ));
|
||||
-
|
||||
- new TimingsExport(listeners, parent, history).start();
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
|
||||
index dee9655b89d061ec8218ea2c54660c6003e8548f..253b73cfc597d4c7106d969be7b18c68166128ae 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
|
||||
@ -129,6 +145,33 @@ index d1152585c5f482e554966f965561626c78ac4d3a..00000000000000000000000000000000
|
||||
- this.world.timings.countNaturalMobs.startTiming(); // Paper - timings
|
||||
- int l = this.chunkMapDistance.b();
|
||||
- // Paper start - per player mob spawning
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index 77b6e4dd34893f0959574f95078bc3fa6896e69c..7ac6ef0a125499de4b5e6a9ed80f963ba623b9f6 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -181,6 +181,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
// Paper end
|
||||
com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
|
||||
app.akarin.server.Config.init((java.io.File) options.valueOf("akarin-settings")); // Akarin - Server Config
|
||||
+ com.proximyst.rainforest.RainforestConfig.init((java.io.File) options.valueOf("rainforest-settings")); // Rainforest
|
||||
|
||||
this.setPVP(dedicatedserverproperties.pvp);
|
||||
this.setAllowFlight(dedicatedserverproperties.allowFlight);
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java.rej b/src/main/java/net/minecraft/server/DedicatedServer.java.rej
|
||||
deleted file mode 100644
|
||||
index 4c2d5b3e080c925d687733ec40d4fb4b22552c96..0000000000000000000000000000000000000000
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java.rej
|
||||
+++ /dev/null
|
||||
@@ -1,9 +0,0 @@
|
||||
-diff a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java (rejected hunks)
|
||||
-@@ -170,6 +170,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
- com.destroystokyo.paper.PaperConfig.registerCommands();
|
||||
- com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
|
||||
- // Paper end
|
||||
-+ com.proximyst.rainforest.RainforestConfig.init((java.io.File) options.valueOf("rainforest-settings")); // Rainforest
|
||||
-
|
||||
- this.setPVP(dedicatedserverproperties.pvp);
|
||||
- this.setAllowFlight(dedicatedserverproperties.allowFlight);
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
index e19bb5ce5c32d9c08336f802fa9058603e23c6ab..d73ef98330c4ae643950b16341b3cde0d52928ce 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
@ -527,31 +570,32 @@ index bada470cba41cce9beb9eb04227b42c1d489d731..00000000000000000000000000000000
|
||||
- private int c;
|
||||
- private TileEntityShulkerBox.AnimationPhase i;
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index b32638165798a4b6022fc41e9c9ac8d5dac507a5..5111875cdb28b6958dec09215d4d4b8c8cbaad5a 100644
|
||||
index 409861c52461b7138eee3df75e43f0f02d2fcfed..742625adc828bb1d4afa9542895bd9e71a065c15 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -96,6 +96,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
@@ -97,6 +97,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
|
||||
public final com.tuinity.tuinity.config.TuinityConfig.WorldConfig tuinityConfig; // Tuinity - Server Config
|
||||
public final app.akarin.server.Config.WorldConfig akarinConfig; // Akarin - Server Config
|
||||
+ public final us.minevict.papercut.PapercutConfig.WorldConfig papercutConfig; // Papercut
|
||||
+ public final net.pl3x.purpur.PurpurWorldConfig purpurConfig; // Purpur
|
||||
+ public final de.minebench.origami.OrigamiConfig.WorldConfig origamiConfig; // Origami - World Config
|
||||
+ public final RainforestWorldConfig rainforestConfig; // Rainforest
|
||||
|
||||
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
|
||||
public static BlockPosition lastPhysicsProblem; // Spigot
|
||||
@@ -126,6 +129,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
@@ -127,6 +130,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig, executor) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
|
||||
this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConfig(((WorldDataServer)worlddatamutable).getName()); // Tuinity - Server Config
|
||||
this.akarinConfig = new app.akarin.server.Config.WorldConfig(((WorldDataServer)worlddatamutable).getName()); // Akarin - Server Config
|
||||
+ this.papercutConfig = new us.minevict.papercut.PapercutConfig.WorldConfig(((WorldDataServer)worlddatamutable).getName()); // Papercut
|
||||
+ this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((((WorldDataServer)worlddatamutable).getName())); // Purpur
|
||||
+ this.origamiConfig = new de.minebench.origami.OrigamiConfig.WorldConfig(((WorldDataServer)worlddatamutable).getName()); // Origami - World Config
|
||||
+ this.rainforestConfig = new RainforestWorldConfig((((WorldDataServer)worlddatamutable).getName()), this.paperConfig); // Rainforest
|
||||
+
|
||||
+
|
||||
this.generator = gen;
|
||||
this.world = new CraftWorld((WorldServer) this, gen, env);
|
||||
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
|
||||
@@ -636,6 +643,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
@@ -637,6 +645,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
|
||||
public void b(BlockPosition blockposition, IBlockData iblockdata, IBlockData iblockdata1) {}
|
||||
|
||||
@ -559,16 +603,7 @@ index b32638165798a4b6022fc41e9c9ac8d5dac507a5..5111875cdb28b6958dec09215d4d4b8c
|
||||
public void applyPhysics(BlockPosition blockposition, Block block) {
|
||||
if (captureBlockStates) { return; } // Paper - Cancel all physics during placement
|
||||
this.a(blockposition.west(), block, blockposition);
|
||||
@@ -645,7 +653,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
this.a(blockposition.north(), block, blockposition);
|
||||
this.a(blockposition.south(), block, blockposition);
|
||||
}
|
||||
-
|
||||
+
|
||||
public void a(BlockPosition blockposition, Block block, EnumDirection enumdirection) {
|
||||
if (enumdirection != EnumDirection.WEST) {
|
||||
this.a(blockposition.west(), block, blockposition);
|
||||
@@ -673,6 +681,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
@@ -674,6 +683,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
|
||||
}
|
||||
|
||||
@ -792,36 +827,39 @@ index 120d0df27e76c9beef9f09e6cdc0972454fdd4ca..00000000000000000000000000000000
|
||||
- }
|
||||
-
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index d290bc1b8bea4fac9d4e14a1ccdf954055291e66..5bdde162b6f2aa81d136d82504ab5890e5262279 100644
|
||||
index d290bc1b8bea4fac9d4e14a1ccdf954055291e66..b8fc854c49adea606812cc84eb671e5a208792f7 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -842,6 +842,8 @@ public final class CraftServer implements Server {
|
||||
@@ -842,6 +842,9 @@ public final class CraftServer implements Server {
|
||||
com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
|
||||
com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config
|
||||
app.akarin.server.Config.init((File) console.options.valueOf("akarin-settings")); // Akarin - Server Config
|
||||
+ net.pl3x.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
|
||||
+ de.minebench.origami.OrigamiConfig.init((File) console.options.valueOf("origami-settings")); // Origami - Server Config
|
||||
+ com.proximyst.rainforest.RainforestConfig.init((File) console.options.valueOf("rainforest-settings")); // Rainforest
|
||||
for (WorldServer world : console.getWorlds()) {
|
||||
world.worldDataServer.setDifficulty(config.difficulty);
|
||||
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
|
||||
@@ -878,6 +880,9 @@ public final class CraftServer implements Server {
|
||||
@@ -878,6 +881,9 @@ public final class CraftServer implements Server {
|
||||
world.paperConfig.init(); // Paper
|
||||
world.tuinityConfig.init(); // Tuinity - Server Config
|
||||
world.akarinConfig.init(); // Akarin - Server Config
|
||||
+ world.papercutConfig.init(); // Papercut
|
||||
+ world.rainforestConfig.init(); // Rainforest
|
||||
+ world.purpurConfig.init(); // Purpur
|
||||
+ world.origamiConfig.init(); // Origami - World Config
|
||||
}
|
||||
|
||||
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
|
||||
@@ -2255,6 +2260,25 @@ public final class CraftServer implements Server {
|
||||
@@ -2255,6 +2261,27 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
// Akarin End - Server Config
|
||||
|
||||
+ // Papercut start - add config to timings report
|
||||
+ // Rainforest start
|
||||
+ @Override
|
||||
+ public YamlConfiguration getPapercutConfig() { return us.minevict.papercut.PapercutConfig.config; }
|
||||
+ // Papercut end - add config to timings report
|
||||
+ public YamlConfiguration getRainforestConfig() {
|
||||
+ return com.proximyst.rainforest.RainforestConfig.config;
|
||||
+ }
|
||||
+ // Rainforest end
|
||||
+
|
||||
+ // Purpur start
|
||||
+ @Override
|
||||
@ -840,7 +878,7 @@ index d290bc1b8bea4fac9d4e14a1ccdf954055291e66..5bdde162b6f2aa81d136d82504ab5890
|
||||
@Override
|
||||
public void restart() {
|
||||
org.spigotmc.RestartCommand.restart();
|
||||
@@ -2394,4 +2418,11 @@ public final class CraftServer implements Server {
|
||||
@@ -2394,4 +2421,11 @@ public final class CraftServer implements Server {
|
||||
return mobGoals;
|
||||
}
|
||||
// Paper end
|
||||
@ -854,22 +892,41 @@ index d290bc1b8bea4fac9d4e14a1ccdf954055291e66..5bdde162b6f2aa81d136d82504ab5890
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java.rej b/src/main/java/org/bukkit/craftbukkit/CraftServer.java.rej
|
||||
deleted file mode 100644
|
||||
index b9d3fb83434a48b328cf0a0ae1ec29d93e87aa3e..0000000000000000000000000000000000000000
|
||||
index a3c8dfd94f78b49341e5f5aba1735651096c9d70..0000000000000000000000000000000000000000
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java.rej
|
||||
+++ /dev/null
|
||||
@@ -1,12 +0,0 @@
|
||||
@@ -1,31 +0,0 @@
|
||||
-diff a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java (rejected hunks)
|
||||
-@@ -2409,5 +2409,10 @@ public final class CraftServer implements Server {
|
||||
- public String getServerName() {
|
||||
- return getProperties().serverName;
|
||||
- }
|
||||
-@@ -848,6 +848,7 @@ public final class CraftServer implements Server {
|
||||
-
|
||||
- org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
|
||||
- com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
|
||||
-+ com.proximyst.rainforest.RainforestConfig.init((File) console.options.valueOf("rainforest-settings")); // Rainforest
|
||||
- for (WorldServer world : console.getWorlds()) {
|
||||
- world.worldDataServer.setDifficulty(config.difficulty);
|
||||
- world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
|
||||
-@@ -882,6 +883,7 @@ public final class CraftServer implements Server {
|
||||
- }
|
||||
- world.spigotConfig.init(); // Spigot
|
||||
- world.paperConfig.init(); // Paper
|
||||
-+ world.rainforestConfig.init(); // Rainforest
|
||||
- }
|
||||
-
|
||||
- Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
|
||||
-@@ -2238,6 +2240,13 @@ public final class CraftServer implements Server {
|
||||
- return com.destroystokyo.paper.PaperConfig.config;
|
||||
- }
|
||||
-
|
||||
-+ // Rainforest start
|
||||
-+ @Override
|
||||
-+ public YamlConfiguration getRainforestConfig() {
|
||||
-+ return com.proximyst.rainforest.RainforestConfig.config;
|
||||
-+ }
|
||||
-+ // Rainforest end
|
||||
-+
|
||||
-+ @Override
|
||||
-+ public boolean isLagging() {
|
||||
-+ return getServer().lagging;
|
||||
-+ }
|
||||
- // Purpur end
|
||||
- }
|
||||
- @Override
|
||||
- public void restart() {
|
||||
- org.spigotmc.RestartCommand.restart();
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index 2d12ad72be927712d38d6fb6991f4af7a196fb9b..1a454f74b322605b1006da5be13760b13cc5f931 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@ -907,22 +964,22 @@ index 2d12ad72be927712d38d6fb6991f4af7a196fb9b..1a454f74b322605b1006da5be13760b1
|
||||
.withRequiredArg()
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java.rej b/src/main/java/org/bukkit/craftbukkit/Main.java.rej
|
||||
deleted file mode 100644
|
||||
index 5d35899d1bedbb8643a601a2e1731a9bc66c7b61..0000000000000000000000000000000000000000
|
||||
index 916603085d652444027e4513b77293ece84a6c4f..0000000000000000000000000000000000000000
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java.rej
|
||||
+++ /dev/null
|
||||
@@ -1,16 +0,0 @@
|
||||
-diff a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java (rejected hunks)
|
||||
-@@ -146,6 +146,14 @@ public class Main {
|
||||
-@@ -139,6 +139,14 @@ public class Main {
|
||||
- .describedAs("Yml file");
|
||||
- /* Conctete End - Server Config */
|
||||
- // Paper end
|
||||
-
|
||||
-+ // Purpur Start
|
||||
-+ acceptsAll(asList("purpur", "purpur-settings"), "File for purpur settings")
|
||||
-+ // Rainforest start
|
||||
-+ acceptsAll(asList("rainforest", "rainforest-settings"), "File for rainforest settings")
|
||||
-+ .withRequiredArg()
|
||||
-+ .ofType(File.class)
|
||||
-+ .defaultsTo(new File("purpur.yml"))
|
||||
-+ .defaultsTo(new File("rainforest.yml"))
|
||||
-+ .describedAs("Yml file");
|
||||
-+ // Purpur end
|
||||
-+ // Rainforest end
|
||||
-+
|
||||
- // Paper start
|
||||
- acceptsAll(asList("server-name"), "Name of the server")
|
||||
|
@ -57,7 +57,7 @@ index e17119d37577de42f8d52afcfdfee64c33996941..7cc402a4dfaa2a4bb123c897b05c0919
|
||||
|
||||
public CrashReport b(CrashReport crashreport) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 5bdde162b6f2aa81d136d82504ab5890e5262279..a4802d89f601ef38a1235fb162cec9aef94851ee 100644
|
||||
index b8fc854c49adea606812cc84eb671e5a208792f7..c80d67b7f5317908087ae286a53e2483c7b51df1 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -217,7 +217,7 @@ import javax.annotation.Nullable; // Paper
|
||||
|
@ -28,10 +28,10 @@ index 7cc402a4dfaa2a4bb123c897b05c09190cbdd489..8e5284fd39be45055bec1609f6b8dd05
|
||||
this.X = true;
|
||||
// Purpur start - tps catchup
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index a4802d89f601ef38a1235fb162cec9aef94851ee..1263bba4e41b8f60ee52ea569159db9d52dfe0fb 100644
|
||||
index c80d67b7f5317908087ae286a53e2483c7b51df1..5d57619ae0289a48aa0c7cb57f146fe9fd96a6b1 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2425,4 +2425,11 @@ public final class CraftServer implements Server {
|
||||
@@ -2428,4 +2428,11 @@ public final class CraftServer implements Server {
|
||||
return getServer().lagging;
|
||||
}
|
||||
// Purpur end
|
||||
|
@ -1,6 +1,6 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: tr7zw <tr7zw@live.de>
|
||||
Date: Tue, 4 Aug 2020 19:19:20 -0500
|
||||
From: Bud Gidiere <sgidiere@gmail.com>
|
||||
Date: Wed, 5 Aug 2020 08:05:10 -0500
|
||||
Subject: [PATCH] Add config Yatopia command and basic settings
|
||||
|
||||
|
||||
@ -357,7 +357,7 @@ index 0000000000000000000000000000000000000000..19bea6ee83d8b25da022662253328fb6
|
||||
+}
|
||||
\ No newline at end of file
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index 77b6e4dd34893f0959574f95078bc3fa6896e69c..f8033f57cdf8528199203506a9db92be7b1351ac 100644
|
||||
index 7ac6ef0a125499de4b5e6a9ed80f963ba623b9f6..0170f25a694e757798ebd4a37c90b1c1e479d3bd 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -7,6 +7,7 @@ import com.mojang.authlib.GameProfileRepository;
|
||||
@ -368,10 +368,11 @@ index 77b6e4dd34893f0959574f95078bc3fa6896e69c..f8033f57cdf8528199203506a9db92be
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.InetAddress;
|
||||
@@ -182,6 +183,16 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
@@ -182,7 +183,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
|
||||
app.akarin.server.Config.init((java.io.File) options.valueOf("akarin-settings")); // Akarin - Server Config
|
||||
|
||||
com.proximyst.rainforest.RainforestConfig.init((java.io.File) options.valueOf("rainforest-settings")); // Rainforest
|
||||
-
|
||||
+ // Yatopia start
|
||||
+ try {
|
||||
+ dev.tr7zw.yatopia.YatopiaConfig.init(new File("yatopia.yml"));
|
||||
@ -381,15 +382,14 @@ index 77b6e4dd34893f0959574f95078bc3fa6896e69c..f8033f57cdf8528199203506a9db92be
|
||||
+ }
|
||||
+ dev.tr7zw.yatopia.YatopiaConfig.registerCommands();
|
||||
+ // Yatopia end
|
||||
+
|
||||
this.setPVP(dedicatedserverproperties.pvp);
|
||||
this.setAllowFlight(dedicatedserverproperties.allowFlight);
|
||||
this.setResourcePack(dedicatedserverproperties.resourcePack, this.aY());
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 98c5ecdf8b59670c872cb43593054f5a91d5e9fe..c77bb0b092cf4198edb6334520fd57042b4e171c 100644
|
||||
index 4581d00680f3a2043faadcd3db9d6398a6befb6e..19699d5276b7851c657b2af78c38edb568b0e5f9 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -1035,7 +1035,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
@@ -1036,7 +1036,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this);
|
||||
VoxelShape voxelshape = this.world.getWorldBorder().c();
|
||||
Stream<VoxelShape> stream = !this.world.getWorldBorder().isInBounds(axisalignedbb) ? Stream.empty() : Stream.of(voxelshape); // Paper
|
||||
|
@ -1,6 +1,6 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: tr7zw <tr7zw@live.de>
|
||||
Date: Fri, 31 Jul 2020 22:04:17 -0500
|
||||
From: Bud Gidiere <sgidiere@gmail.com>
|
||||
Date: Wed, 5 Aug 2020 08:08:44 -0500
|
||||
Subject: [PATCH] Optimize TileEntity loading
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ index c2c19a6fbfa2a4aba21aa71789071c69a6246556..7dfd36e22a896ae440bbda6db0628c44
|
||||
}
|
||||
\ No newline at end of file
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 5111875cdb28b6958dec09215d4d4b8c8cbaad5a..c0429637d72d95b4f52d9eb69606b4b15eb7d390 100644
|
||||
index 742625adc828bb1d4afa9542895bd9e71a065c15..b38e97a6aa207bca9e42c3d4247aa4a76e67581e 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -2,6 +2,8 @@ package net.minecraft.server;
|
||||
@ -44,15 +44,15 @@ index 5111875cdb28b6958dec09215d4d4b8c8cbaad5a..c0429637d72d95b4f52d9eb69606b4b1
|
||||
import com.destroystokyo.paper.antixray.ChunkPacketBlockController; // Paper - Anti-Xray
|
||||
import com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray; // Paper - Anti-Xray
|
||||
import com.destroystokyo.paper.event.server.ServerExceptionEvent;
|
||||
@@ -10,6 +12,7 @@ import com.google.common.base.MoreObjects;
|
||||
import com.google.common.collect.Lists;
|
||||
@@ -11,6 +13,7 @@ import com.google.common.collect.Lists;
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.proximyst.rainforest.RainforestWorldConfig;
|
||||
import java.io.IOException;
|
||||
+import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
@@ -42,8 +45,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
@@ -43,8 +46,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
public static final ResourceKey<World> THE_END = ResourceKey.a(IRegistry.ae, new MinecraftKey("the_end"));
|
||||
private static final EnumDirection[] a = EnumDirection.values();
|
||||
//public final List<TileEntity> tileEntityList = Lists.newArrayList(); // Paper - remove unused list
|
||||
|
@ -1,6 +1,6 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: tr7zw <tr7zw@live.de>
|
||||
Date: Tue, 4 Aug 2020 19:26:12 -0500
|
||||
From: Bud Gidiere <sgidiere@gmail.com>
|
||||
Date: Wed, 5 Aug 2020 08:17:46 -0500
|
||||
Subject: [PATCH] Redirect Configs
|
||||
|
||||
|
||||
@ -40,6 +40,40 @@ index 1742facec843dd87897d62e4aab819835fab4a38..358ac3361c814b7cf5f9650a6a49c6ef
|
||||
}
|
||||
|
||||
public static void load(final YamlConfiguration config) {
|
||||
diff --git a/src/main/java/com/proximyst/rainforest/RainforestConfig.java b/src/main/java/com/proximyst/rainforest/RainforestConfig.java
|
||||
index e698f8c8c3bfbd96465e7f7c3c3fee63ff0efd22..2ec97e5d82305872c999693793ce228a20669b43 100644
|
||||
--- a/src/main/java/com/proximyst/rainforest/RainforestConfig.java
|
||||
+++ b/src/main/java/com/proximyst/rainforest/RainforestConfig.java
|
||||
@@ -18,6 +18,8 @@ import org.bukkit.command.Command;
|
||||
import org.bukkit.configuration.InvalidConfigurationException;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
|
||||
+import dev.tr7zw.yatopia.YatopiaConfig;
|
||||
+
|
||||
// Based on PaperConfig
|
||||
public final class RainforestConfig {
|
||||
private static File CONFIG_FILE;
|
||||
@@ -37,8 +39,7 @@ public final class RainforestConfig {
|
||||
private static boolean fatalError;
|
||||
|
||||
public static void init(File configFile) {
|
||||
- CONFIG_FILE = configFile;
|
||||
- config = new YamlConfiguration();
|
||||
+ /*config = new YamlConfiguration();
|
||||
try {
|
||||
config.load(CONFIG_FILE);
|
||||
} catch (IOException ex) {
|
||||
@@ -56,7 +57,9 @@ public final class RainforestConfig {
|
||||
|
||||
version = getInt("config-version", 1);
|
||||
set("config-version", 1);
|
||||
- readConfig(RainforestConfig.class, null);
|
||||
+ readConfig(RainforestConfig.class, null);*/
|
||||
+ config = YatopiaConfig.config;
|
||||
+ CONFIG_FILE = YatopiaConfig.CONFIG_FILE;
|
||||
}
|
||||
|
||||
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 bd107a376eaf660ba1ad61c035f8ed2d9d04749c..157a5c1be65b6b39787e5be11d1a8d5ea4aeb2b8 100644
|
||||
--- a/src/main/java/de/minebench/origami/OrigamiConfig.java
|
||||
@ -87,7 +121,7 @@ index 9f04500e167b8403c7487044a4ae03a6be61062a..fb3bf0731512b5517ca7ccb3240085b4
|
||||
+ "Yatopia contains many breaking changes and settings, so know what you are doing!\n"
|
||||
+ "You have been warned!\n";
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index f8033f57cdf8528199203506a9db92be7b1351ac..d6f7d31418459fedaf486f2eeaa0d7ec0151552c 100644
|
||||
index 0170f25a694e757798ebd4a37c90b1c1e479d3bd..73f4d52f24d042e287dab351edd4bfa4e22046b4 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -169,6 +169,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
@ -106,11 +140,10 @@ index f8033f57cdf8528199203506a9db92be7b1351ac..d6f7d31418459fedaf486f2eeaa0d7ec
|
||||
// Purpur start
|
||||
try {
|
||||
net.pl3x.purpur.PurpurConfig.init((java.io.File) options.valueOf("purpur-settings"));
|
||||
@@ -182,16 +191,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
// Paper end
|
||||
@@ -183,14 +192,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
|
||||
app.akarin.server.Config.init((java.io.File) options.valueOf("akarin-settings")); // Akarin - Server Config
|
||||
-
|
||||
com.proximyst.rainforest.RainforestConfig.init((java.io.File) options.valueOf("rainforest-settings")); // Rainforest
|
||||
- // Yatopia start
|
||||
- try {
|
||||
- dev.tr7zw.yatopia.YatopiaConfig.init(new File("yatopia.yml"));
|
||||
@ -119,9 +152,8 @@ index f8033f57cdf8528199203506a9db92be7b1351ac..d6f7d31418459fedaf486f2eeaa0d7ec
|
||||
- return false;
|
||||
- }
|
||||
- dev.tr7zw.yatopia.YatopiaConfig.registerCommands();
|
||||
- // Yatopia end
|
||||
+ de.minebench.origami.OrigamiConfig.init((java.io.File) options.valueOf("origami-settings"));
|
||||
|
||||
// Yatopia end
|
||||
this.setPVP(dedicatedserverproperties.pvp);
|
||||
this.setAllowFlight(dedicatedserverproperties.allowFlight);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
|
Loading…
Reference in New Issue
Block a user