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

Update upstream

Browse Source
This commit is contained in:
tr7zw 2020-03-30 00:41:19 +02:00
parent bb527ae2d6
commit 9f93a8da37
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tuinity

@ -1 +1 @@
Subproject commit 99854e9ee0f9d99ff8e695d973ed3e458bce0da5 Subproject commit e5045a0384674b68508ac4d22e59f5584827e06e

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

@ -1,4 +1,4 @@
From 2cc0abcaff63fb0e1f5a664002cb8d7c29a29031 Mon Sep 17 00:00:00 2001 From 9a15305f9ae99bdf29cc4ed4a3532c495cf4c5b4 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 d3bcecb90..9a84da011 100644 index 22ceb99fd..edfb77fc3 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
@@ -1687,7 +1687,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -1650,7 +1650,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
} }
public boolean c(NBTTagCompound nbttagcompound) { public boolean c(NBTTagCompound nbttagcompound) {

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

@ -1,4 +1,4 @@
From 4731c9cd06bfaeaf38cfb8dc47e131dd80ec5605 Mon Sep 17 00:00:00 2001 From 42f070cdef94a25add267149abe75dbe6f077457 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
@ -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 9a84da011..b955580f2 100644 index edfb77fc3..68a887f1c 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
@@ -832,6 +832,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -795,6 +795,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
try { try {
this.inLava = false; this.inLava = false;
@ -407,7 +407,7 @@ index 9a84da011..b955580f2 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");
@@ -956,7 +957,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -919,7 +920,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);

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

@ -1,4 +1,4 @@
From 89af13d2a4a27f42b1c09a80912b652f11eccc82 Mon Sep 17 00:00:00 2001 From fe971f01c2ef8780f3bf164f915681761b9a0629 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 b955580f2..c9da5805d 100644 index 68a887f1c..837044d96 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 b955580f2..c9da5805d 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;
@@ -955,31 +956,60 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -918,31 +919,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 b955580f2..c9da5805d 100644
} }
return vec3d1; return vec3d1;
@@ -1002,6 +1032,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -965,6 +995,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return a(vec3d, axisalignedbb, world, voxelshapecollision, streamaccumulator); return a(vec3d, axisalignedbb, world, voxelshapecollision, streamaccumulator);
} }
} }