Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9a19308 Lock Frozen Ticks API (#7207)
PaperMC/Paper@a058ac0 Dolphin API (#7102)
PaperMC/Paper@f6c7d53 Add configurable stronghold seed (#7334)
PaperMC/Paper@7978121 More PotionEffectType API (#5737)
PaperMC/Paper@9490475 Add STRUCTURE_TYPE registry entry (#6400)
This commit is contained in:
BillyGalbreath
2022-01-23 18:04:09 -06:00
parent 746e8f9caf
commit cb7bcb9686
29 changed files with 98 additions and 105 deletions

View File

@@ -123,10 +123,10 @@ index a828cad27fcd39f8bfbaefa97052a2a3b6650ee7..19d6165f266fcc39bc3533042109ef1b
return this.isFireSource;
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 04298bb935eacab6245afc0ae465ef0fab09101e..0f9758851ed05dd27496653cb0c00e6b0711a408 100644
index e0c91bc518168441fffa32f4c611a74800a8d2e2..452d56e6e0c6682f0d55697b3e9e94d53e186f92 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3650,6 +3650,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -3657,6 +3657,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
return SlotAccess.NULL;
}