Upstream
/
Yatopia
mirror of https://github.com/YatopiaMC/Yatopia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated Upstream and Sidestream(s) (Tuinity/EMC) 

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
1421cca \Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.4
ed9e0c4 Fix worldborder checks for getCubes

EMC Changes:
110f769f Updated Paper
This commit is contained in:
Ivan Pekov 2020-11-22 15:22:29 +02:00
parent 37e61be6c2
commit a47bfa7ea1
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
8 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Empirecraft

@ -1 +1 @@
Subproject commit 4da58340ad02da0ed12b4aa1c3324ad8018eabf4
Subproject commit 110f769f453976741b453283a548b830a06023f6

2
Tuinity

@ -1 +1 @@
Subproject commit ecc046e8a9b6d606b1359fe714ebec7bde3e6f75
Subproject commit 1421ccab6eb9a84975d0ca142e9054699010189b

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

@ -381,7 +381,7 @@ index c2b788bb29fdfec9b4b6768a42e32e5af966f0ae..00000000000000000000000000000000
-
- // Tuinity start - controlled flush for entity tracker packets
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 82dc54fdb927f57bfb7f01fcd36f6d981e250fdc..8fc4d3d250367cc2d141b110833cb1e3572bd7f0 100644
index 4acdb6b479e87562b93b07a40398a7bb19186006..f657ace0000e7f4850088e04e7bfc8dd0be69a6c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -440,7 +440,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -402,7 +402,7 @@ index 82dc54fdb927f57bfb7f01fcd36f6d981e250fdc..8fc4d3d250367cc2d141b110833cb1e3
}
public void resetPortalCooldown() {
@@ -2418,7 +2418,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2421,7 +2421,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
WorldServer worldserver1 = minecraftserver.getWorldServer(resourcekey);
if (true && !this.isPassenger() && this.portalTicks++ >= i) { // CraftBukkit
@ -411,7 +411,7 @@ index 82dc54fdb927f57bfb7f01fcd36f6d981e250fdc..8fc4d3d250367cc2d141b110833cb1e3
this.portalTicks = i;
this.resetPortalCooldown();
// CraftBukkit start
@@ -2428,7 +2428,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2431,7 +2431,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.b(worldserver1);
}
// CraftBukkit end
@ -420,7 +420,7 @@ index 82dc54fdb927f57bfb7f01fcd36f6d981e250fdc..8fc4d3d250367cc2d141b110833cb1e3
}
this.inPortal = false;
@@ -2815,14 +2815,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2818,14 +2818,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
// Paper end
if (this.world instanceof WorldServer && !this.dead) {
@ -437,7 +437,7 @@ index 82dc54fdb927f57bfb7f01fcd36f6d981e250fdc..8fc4d3d250367cc2d141b110833cb1e3
ShapeDetectorShape shapedetectorshape = (location == null) ? this.a(worldserver) : new ShapeDetectorShape(new Vec3D(location.getX(), location.getY(), location.getZ()), Vec3D.ORIGIN, this.yaw, this.pitch, worldserver, null); // CraftBukkit
if (shapedetectorshape == null) {
@@ -2855,10 +2855,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2858,10 +2858,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
this.bN();
@ -1342,7 +1342,7 @@ index 3a35169eaf680c45fe42922eb5f0014fa422c31c..00000000000000000000000000000000
- }
- // Spigot Start
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 7acbe311158edae05af09653f2deadfbc036ed76..507e13bcd2f4b012338a3114e6187acc2ca51b84 100644
index ca835dc52ddfd117abb45a85277939eb6a036075..ef25ea47159cc58659756fb4b2e223e556065b00 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -872,9 +872,9 @@ public class WorldServer extends World implements GeneratorAccessSeed {

4
patches/server/0013-lithium-MixinBox.patch
View File

@ -7,10 +7,10 @@ Original code by JellySquid, licensed under GNU Lesser General Public License v3
you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings)
diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
index 6aa9f07336c23150ca72bdf3d45677e8d40ee4e9..e2d6b4ff007d5cef9bfbe2c989c2bb503c44508f 100644
index 20e9e06b36cda913809b46e71144d212322619aa..ed5b153f081b8c42b92cb8b195ff54d18e900490 100644
--- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
+++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
@@ -185,12 +185,38 @@ public class AxisAlignedBB {
@@ -194,12 +194,38 @@ public class AxisAlignedBB {
return new AxisAlignedBB(vec3d.x, vec3d.y, vec3d.z, vec3d.x + 1.0D, vec3d.y + 1.0D, vec3d.z + 1.0D);
}

4
patches/server/0026-Fix-lead-fall-dmg-config.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Fix lead fall dmg config
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 8fc4d3d250367cc2d141b110833cb1e3572bd7f0..5beca7e82b3f2a44c376ab2fedac27ce8b7fbd3a 100644
index f657ace0000e7f4850088e04e7bfc8dd0be69a6c..015f8103506ed5235f4dfc4a889ff943c353d830 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1293,6 +1293,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1296,6 +1296,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.fallDistance = 0.0F;
} else if (d0 < 0.0D) {
this.fallDistance = (float) ((double) this.fallDistance - d0);

2
patches/server/0027-Optimize-some-stuff-in-WorldServer-ticking.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Optimize some stuff in WorldServer ticking
Replaced some streams and some array lists with glue lists
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 507e13bcd2f4b012338a3114e6187acc2ca51b84..9417032aecb79916a9dbde71e2447d00018e3b28 100644
index ef25ea47159cc58659756fb4b2e223e556065b00..599e4c0f0127ebdbc8d1009719bda81224e43aab 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -64,11 +64,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {

36
patches/server/0033-Highly-optimize-VillagePlace-filtering.patch
View File

@ -424,27 +424,27 @@ index f43bc1f7d693d63c6bbdba976c048d2d0c8767b1..8b9f5797a6bee47ff16ee713777b5220
}
diff --git a/src/main/java/net/yatopia/server/HoldingConsumer.java b/src/main/java/net/yatopia/server/HoldingConsumer.java
new file mode 100644
index 0000000000000000000000000000000000000000..fca24201a721f0ac6c962e79119c4613734e8108
index 0000000000000000000000000000000000000000..438adad46014043591f41d037d130a8569ec754f
--- /dev/null
+++ b/src/main/java/net/yatopia/server/HoldingConsumer.java
@@ -0,0 +1,17 @@
+package net.yatopia.server;
+
+import java.util.function.Consumer;
+
+public class HoldingConsumer<T> implements Consumer<T> {
+
+ private T value;
+
+ @Override
+ public void accept(T t) {
+ this.value = t;
+ }
+
+ public T getValue() {
+ return value;
+ }
+}
+package net.yatopia.server;
+
+import java.util.function.Consumer;
+
+public class HoldingConsumer<T> implements Consumer<T> {
+
+ private T value;
+
+ @Override
+ public void accept(T t) {
+ this.value = t;
+ }
+
+ public T getValue() {
+ return value;
+ }
+}
diff --git a/src/main/java/net/yatopia/server/YatopiaChunkPos.java b/src/main/java/net/yatopia/server/YatopiaChunkPos.java
new file mode 100644
index 0000000000000000000000000000000000000000..871e305356103f87c2c1ad1487c804b60e13c076

2
patches/server/0039-Fix-LightEngineThreaded-memory-leak.patch
View File

@ -18,7 +18,7 @@ index 2f9c97dd4e1d705a87772d18c7ab4883a876af08..f3494ac1ad659352ca5595adf9e6919b
return this.size == 0 && this.pendingTasks.isEmpty();
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 9417032aecb79916a9dbde71e2447d00018e3b28..abc62fb1e95f75355871e06341d6687433d74e94 100644
index 599e4c0f0127ebdbc8d1009719bda81224e43aab..921ac7d48b3524dc818c960d7bbb07e5a3b4fa93 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1905,6 +1905,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {