Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-22 18:46:27 +01:00
Code Issues Projects Releases Wiki Activity

Update Upstream

Browse Source
This commit is contained in:
tr7zw 2020-04-02 16:22:55 +02:00
parent d6679a78e3
commit 5070754a1f
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tuinity

@ -1 +1 @@
Subproject commit c2ad42c69468a887a271291d56183c6b3a6c012d Subproject commit b6c375241030dddc66f375b8ff6e842b8d8a8e62

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

@ -1,4 +1,4 @@
From db45a9b1f78962fc0229097f645905cd92215182 Mon Sep 17 00:00:00 2001 From 05761dde3fa3510c100cf5c8ad718d07f0c11d89 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de> From: tr7zw <tr7zw@live.de>
Date: Wed, 26 Feb 2020 21:39:58 +0100 Date: Wed, 26 Feb 2020 21:39:58 +0100
Subject: [PATCH] Don't save Fireworks and Arrows 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(-) 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 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 96d091e4b..71a14005f 100644 index 1716a5960..2dc2bc7d0 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1691,7 +1691,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -1706,7 +1706,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
} }
public boolean c(NBTTagCompound nbttagcompound) { public boolean c(NBTTagCompound nbttagcompound) {

12
patches/server/0042-Add-config-yapfa-command-and-basic-settings.patch
View File

@ -1,4 +1,4 @@
From d9fa2ee2e364ccac3437464113ad003c10a4ff2b Mon Sep 17 00:00:00 2001 From abb910f2909b4d1747476e32fb727453657022a1 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de> From: tr7zw <tr7zw@live.de>
Date: Thu, 5 Mar 2020 22:31:50 +0100 Date: Thu, 5 Mar 2020 22:31:50 +0100
Subject: [PATCH] Add config, yapfa command and basic settings Subject: [PATCH] Add config, yapfa command and basic settings
@ -376,7 +376,7 @@ index 000000000..9711cbc52
+} +}
\ No newline at end of file \ 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 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 610826c9e..2ed69f567 100644 index 911c5d667..7c3d4c718 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java --- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -194,6 +194,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -194,6 +194,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -396,10 +396,10 @@ index 610826c9e..2ed69f567 100644
this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 71a14005f..c1e283406 100644 index 2dc2bc7d0..b99ece594 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -829,6 +829,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -844,6 +844,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
try { try {
this.inLava = false; this.inLava = false;
@ -407,7 +407,7 @@ index 71a14005f..c1e283406 100644
this.checkBlockCollisions(); this.checkBlockCollisions();
} catch (Throwable throwable) { } catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Checking entity block collision"); CrashReport crashreport = CrashReport.a(throwable, "Checking entity block collision");
@@ -960,7 +961,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -975,7 +976,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this); VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this);
VoxelShape voxelshape = this.world.getWorldBorder().a(); VoxelShape voxelshape = this.world.getWorldBorder().a();
Stream<VoxelShape> stream = VoxelShapes.c(voxelshape, VoxelShapes.a(axisalignedbb.shrink(1.0E-7D)), OperatorBoolean.AND) ? Stream.empty() : Stream.of(voxelshape); Stream<VoxelShape> stream = VoxelShapes.c(voxelshape, VoxelShapes.a(axisalignedbb.shrink(1.0E-7D)), OperatorBoolean.AND) ? Stream.empty() : Stream.of(voxelshape);
@ -417,7 +417,7 @@ index 71a14005f..c1e283406 100644
Vec3D vec3d1 = vec3d.g() == 0.0D ? vec3d : a(this, vec3d, axisalignedbb, this.world, voxelshapecollision, streamaccumulator); Vec3D vec3d1 = vec3d.g() == 0.0D ? vec3d : a(this, vec3d, axisalignedbb, this.world, voxelshapecollision, streamaccumulator);
boolean flag = vec3d.x != vec3d1.x; boolean flag = vec3d.x != vec3d1.x;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index e0a61a0f7..bd3b9e898 100644 index c474c3e09..384307a91 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -246,6 +246,7 @@ public abstract class EntityLiving extends Entity { @@ -246,6 +246,7 @@ public abstract class EntityLiving extends Entity {

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

@ -1,4 +1,4 @@
From da52e616bf5adb096dbaf5878980d8297f4540dc Mon Sep 17 00:00:00 2001 From cabaf2bc8d8ca1f5bb4d32b1e43d613aa439dc3d Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de> From: tr7zw <tr7zw@live.de>
Date: Mon, 23 Mar 2020 18:20:58 +0100 Date: Mon, 23 Mar 2020 18:20:58 +0100
Subject: [PATCH] Remove Stream usage Subject: [PATCH] Remove Stream usage
@ -328,7 +328,7 @@ index 6def3616e..e1338f809 100644
public Stream<MinecraftKey> c() { public Stream<MinecraftKey> c() {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index c1e283406..f8e91008a 100644 index b99ece594..2edbdffc1 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/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; @@ -13,6 +13,7 @@ import java.util.Locale;
@ -339,7 +339,7 @@ index c1e283406..f8e91008a 100644
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -959,31 +960,60 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -974,31 +975,60 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
private Vec3D e(Vec3D vec3d) { private Vec3D e(Vec3D vec3d) {
AxisAlignedBB axisalignedbb = this.getBoundingBox(); AxisAlignedBB axisalignedbb = this.getBoundingBox();
VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this); VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this);
@ -415,7 +415,7 @@ index c1e283406..f8e91008a 100644
} }
return vec3d1; return vec3d1;
@@ -1006,6 +1036,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -1021,6 +1051,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return a(vec3d, axisalignedbb, world, voxelshapecollision, streamaccumulator); return a(vec3d, axisalignedbb, world, voxelshapecollision, streamaccumulator);
} }
} }
@ -508,7 +508,7 @@ index c1e283406..f8e91008a 100644
public static Vec3D a(Vec3D vec3d, AxisAlignedBB axisalignedbb, StreamAccumulator<VoxelShape> streamaccumulator) { public static Vec3D a(Vec3D vec3d, AxisAlignedBB axisalignedbb, StreamAccumulator<VoxelShape> streamaccumulator) {
double d0 = vec3d.x; double d0 = vec3d.x;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index bd3b9e898..eb8989d29 100644 index 384307a91..4575498bb 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2649,6 +2649,7 @@ public abstract class EntityLiving extends Entity { @@ -2649,6 +2649,7 @@ public abstract class EntityLiving extends Entity {