Updated Upstream and Sidestream(s) (Tuinity/Purpur/AirplaneLite)

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:
4bcbfd7 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.5
e14829a Updated Upstream (Paper)

Purpur Changes:
cd18335 Update Toothpick

AirplaneLite Changes:
c496d1c Update Downloads URL
683041b Updated Upstream (Tuinity)
This commit is contained in:
Ivan Pekov 2021-01-20 19:15:58 +02:00
parent 0c43fe2949
commit e1249c4648
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
6 changed files with 9 additions and 9 deletions

@ -1 +1 @@
Subproject commit 3200f2a255cfd43767431625e0fe9039d17126ca
Subproject commit c496d1cc713f5c32b1742d02546c281a2b8cbaa9

2
Purpur

@ -1 +1 @@
Subproject commit 7e8bf667fa109167089cd4b0750e1194284cdd64
Subproject commit cd183358589da89639e0ed9efa0743ac5f1de626

@ -1 +1 @@
Subproject commit c04b0058d3149106079ebb68d126ab80b1cabefa
Subproject commit 4bcbfd717e39f8c48028c44aaa75d0d40c0f1c32

View File

@ -197,7 +197,7 @@ index 86f1cfe454ea0a989775b49a6b88375c766ef647..da53af61d1171db3c167c6e007adf953
if (!(this.k instanceof EntityPlayer)) {
throw CommandListenerWrapper.a.create();
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index c33875cf43fecea5196b34d46f9c13c18e77d2a4..69e4b0b8aac9ed7c000edc54ce9cf35255cb2946 100644
index 23ed5cb6f4fd7e81f4ec9d628d362faa280c20ab..7dec4d5aff79c138b8b957d0475f90fb116c582f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -434,7 +434,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -209,7 +209,7 @@ index c33875cf43fecea5196b34d46f9c13c18e77d2a4..69e4b0b8aac9ed7c000edc54ce9cf352
}
protected void af() {
@@ -2409,12 +2409,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2400,12 +2400,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return new Vec2F(this.pitch, this.yaw);
}
@ -263,7 +263,7 @@ index 538b2c92e050176a1ac0bb4c2315f5b22c7f8eac..00000000000000000000000000000000
-
- @Override
diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java
index bbc089b41fcbe0141f13591db2cb44b9e688cac4..a01a14dc27351fd8c4a21068017ff0664ef16f6e 100644
index dc9f2a1a132b3a7925bd62aa1da0512afd90b8b1..9819757e891f658c0a20b27286512d0b0d873d05 100644
--- a/src/main/java/net/minecraft/server/IProjectile.java
+++ b/src/main/java/net/minecraft/server/IProjectile.java
@@ -13,6 +13,7 @@ public abstract class IProjectile extends Entity {

View File

@ -9,7 +9,7 @@ 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/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
index d3f0327a2a7cdedf3fe8d10df981a9f1cb378d26..fdf9d407f3f1d9aabcd835ed868391c6658eaae0 100644
index 9cad895c7d008487ce885cbcc2c3966645df4c19..b63f274ec0afec96b4879f9ebaed72c416d1f9d2 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
@@ -11,6 +11,7 @@ import java.util.function.Supplier;

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 69e4b0b8aac9ed7c000edc54ce9cf35255cb2946..dc131513400bf87aa53ac3f1439b0b0086a2859b 100644
index 7dec4d5aff79c138b8b957d0475f90fb116c582f..a7fc8110f524db2b08448e430d043e575bab8480 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1301,6 +1301,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1292,6 +1292,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);