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

Update Upstream, 2 build artifacts

Browse Source
This commit is contained in:
tr7zw 2020-05-23 16:17:42 +02:00
parent 08f6ea81cb
commit 1b445676cf
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tuinity

@ -1 +1 @@
Subproject commit 5cf4104e6eb407bff5a1fba85c68e3323f4e0961
Subproject commit 6eb873cadacf046e8d542b24426e5297f08fa878

6
patches/server/0033-Don-t-save-Fireworks-and-Arrows.patch
View File

@ -1,4 +1,4 @@
From 11403e9f5cd346dc248cfec0af4ee2c29f061ee0 Mon Sep 17 00:00:00 2001
From 2b3a7a3e330ba54e96c75309226fdc821166ec26 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Wed, 26 Feb 2020 21:39:58 +0100
Subject: [PATCH] Don't save Fireworks and Arrows
@ -8,10 +8,10 @@ Subject: [PATCH] Don't save Fireworks and Arrows
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 352e8699f1..875afe1234 100644
index de7e553fdc..05c2b214a9 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1625,7 +1625,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1630,7 +1630,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean c(NBTTagCompound nbttagcompound) {

8
patches/server/0036-Add-config-yapfa-command-and-basic-settings.patch
View File

@ -1,4 +1,4 @@
From f570f6f636490560894bb5fec5f25374d41878e0 Mon Sep 17 00:00:00 2001
From c23a00f954500be998491e8480b87f05568206d0 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Thu, 5 Mar 2020 22:31:50 +0100
Subject: [PATCH] Add config, yapfa command and basic settings
@ -396,7 +396,7 @@ index c95e1722ac..7297f87189 100644
this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 875afe1234..bf68bb9e81 100644
index 05c2b214a9..195f74ac16 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -763,6 +763,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -407,8 +407,8 @@ index 875afe1234..bf68bb9e81 100644
this.checkBlockCollisions();
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Checking entity block collision");
@@ -892,9 +893,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
private Vec3D e(Vec3D vec3d) {
@@ -897,9 +898,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
// Tuinity end - prevent entities from moving into unloaded chunks
AxisAlignedBB axisalignedbb = this.getBoundingBox();
VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this);
- VoxelShape voxelshape = this.world.getWorldBorder().a();

10
patches/server/0038-Remove-Stream-usage.patch
View File

@ -1,4 +1,4 @@
From 4669f5ff3eccfdbae6708f50213bfb6fcaece907 Mon Sep 17 00:00:00 2001
From 4e8d32b3794901c61a39754a2c732174fabe3413 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Mon, 23 Mar 2020 18:20:58 +0100
Subject: [PATCH] Remove Stream usage
@ -269,7 +269,7 @@ index f0d7a91fa0..15e2439d69 100644
public Stream<MinecraftKey> c() {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index bf68bb9e81..9d8546cd1d 100644
index 195f74ac16..7d80c1779e 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -13,6 +13,7 @@ import java.util.Locale;
@ -280,8 +280,8 @@ index bf68bb9e81..9d8546cd1d 100644
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Stream;
@@ -893,31 +894,60 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
private Vec3D e(Vec3D vec3d) {
@@ -898,31 +899,60 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
// Tuinity end - prevent entities from moving into unloaded chunks
AxisAlignedBB axisalignedbb = this.getBoundingBox();
VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this);
-
@ -356,7 +356,7 @@ index bf68bb9e81..9d8546cd1d 100644
}
return vec3d1;
@@ -940,6 +970,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -945,6 +975,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return a(vec3d, axisalignedbb, world, voxelshapecollision, streamaccumulator);
}
}