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

Update upstream

Browse Source
This commit is contained in:
tr7zw 2020-04-06 20:21:57 +02:00
parent 5c62c2eced
commit 2c1efb1c23
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tuinity

@ -1 +1 @@
Subproject commit b2e87f83e29fed3c5c1b4a8c434202c718addb5d
Subproject commit 0f7d3873ed3cf09b42c1bbaa95a36f7a994b82a5

10
patches/server/0015-EMC-EntityKnockbackEvent.patch
View File

@ -1,4 +1,4 @@
From 360d20b06b9e2b1b8e68275a3ba054e1de3e7a65 Mon Sep 17 00:00:00 2001
From 1e24804eddcaa80dfc30eea7cdb9fedbd090befb Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 16 Mar 2014 20:44:46 -0400
Subject: [PATCH] EMC EntityKnockbackEvent
@ -11,7 +11,7 @@ Control knockback power of entity attacks
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
index d96c03a1..9fc637f9 100644
index d96c03a1a..9fc637f96 100644
--- a/src/main/java/net/minecraft/server/EnchantmentManager.java
+++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
@@ -186,8 +186,13 @@ public class EnchantmentManager {
@ -31,7 +31,7 @@ index d96c03a1..9fc637f9 100644
public static int getFireAspectEnchantmentLevel(EntityLiving entityliving) {
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 584166f2..9346fbf0 100644
index 7afcde608..59408cfd0 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1062,7 +1062,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -44,10 +44,10 @@ index 584166f2..9346fbf0 100644
if (this.isSprinting() && flag) {
sendSoundEffect(this, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_PLAYER_ATTACK_KNOCKBACK, this.getSoundCategory(), 1.0F, 1.0F); // Paper - send while respecting visibility
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 27ef4760..0592e095 100644
index 1991cee43..329f36859 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1315,7 +1315,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1308,7 +1308,7 @@ public abstract class EntityInsentient extends EntityLiving {
if (entity instanceof EntityLiving) {
f += EnchantmentManager.a(this.getItemInMainHand(), ((EntityLiving) entity).getMonsterType());

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

@ -1,4 +1,4 @@
From 55046df1d40955a590b7128b0aecda49dbb224c1 Mon Sep 17 00:00:00 2001
From 99c868e6ecc390c00ea88ea1b07b348d83c1ae18 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 f7620024f..800f6286c 100644
index fb786acf6..25fad49eb 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1619,7 +1619,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1610,7 +1610,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean c(NBTTagCompound nbttagcompound) {

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

@ -1,4 +1,4 @@
From 072fd09182a56fd5cda0f1b7a1a987c95ddabff4 Mon Sep 17 00:00:00 2001
From e4fb138e05f9940d564557685af0df8bd894b173 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,10 +396,10 @@ index 911c5d667..7c3d4c718 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 800f6286c..aad392eaa 100644
index 25fad49eb..58ee4c0c3 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -757,6 +757,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -749,6 +749,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
try {
this.inLava = false;
@ -407,7 +407,7 @@ index 800f6286c..aad392eaa 100644
this.checkBlockCollisions();
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Checking entity block collision");
@@ -888,7 +889,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -880,7 +881,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this);
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);

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

@ -1,4 +1,4 @@
From 3637e62630bb52efb0eb6cc2baf4b54d38ac1f74 Mon Sep 17 00:00:00 2001
From 78fdfde3ff9db6f9d3a0703b545f47050211a1c4 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
@ -328,7 +328,7 @@ index 6def3616e..e1338f809 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 aad392eaa..dc9dce2cf 100644
index 58ee4c0c3..8d9245210 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;
@ -339,7 +339,7 @@ index aad392eaa..dc9dce2cf 100644
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Stream;
@@ -887,31 +888,60 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -879,31 +880,60 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
private Vec3D e(Vec3D vec3d) {
AxisAlignedBB axisalignedbb = this.getBoundingBox();
VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this);
@ -415,7 +415,7 @@ index aad392eaa..dc9dce2cf 100644
}
return vec3d1;
@@ -934,6 +964,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -926,6 +956,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return a(vec3d, axisalignedbb, world, voxelshapecollision, streamaccumulator);
}
}
@ -520,7 +520,7 @@ index 384307a91..4575498bb 100644
this.world.getMethodProfiler().exit();
}
diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java
index d5da9f582..afb8381a2 100644
index 08c83c62d..f9687cdb4 100644
--- a/src/main/java/net/minecraft/server/VoxelShapes.java
+++ b/src/main/java/net/minecraft/server/VoxelShapes.java
@@ -5,9 +5,12 @@ import com.google.common.math.DoubleMath;

6
patches/server/0049-Add-option-for-pushable-TileEntities.patch
View File

@ -1,4 +1,4 @@
From c5752c7a4b7a8d7b4519cacf382f22ce3dafd948 Mon Sep 17 00:00:00 2001
From b3711fd5393f407b2a83e00f6b027e85dfffb45b Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Sun, 29 Mar 2020 01:59:27 +0100
Subject: [PATCH] Add option for pushable TileEntities
@ -669,10 +669,10 @@ index 000000000..b32f23198
+}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 2b6fbd421..83b944d27 100644
index c340578e8..e343d1dc6 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -610,6 +610,13 @@ public class WorldServer extends World {
@@ -310,6 +310,13 @@ public class WorldServer extends World {
if (type instanceof ITileEntity) {
TileEntity replacement = ((ITileEntity) type).createTile(this);