Update Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly
This commit is contained in:
Ben Kerllenevich
2021-08-31 07:23:46 -04:00
parent 64547876a0
commit 19293aabc5
36 changed files with 113 additions and 113 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 770e09f47f74d944f178ae2459936f7ef300e8d1..e8cc670b6852b1831ce9f76c1531f55cfe9f3215 100644
index 6ad500cdcafd35c5c2839859afa0d24695f64430..b0d333d1d776ebd8b98d7f5a7482875044ac76d7 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2775,7 +2775,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -2780,7 +2780,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
}
this.processPortalCooldown();