Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@0193a9d Add EntityPortalReadyEvent (#5619)
PaperMC/Paper@4952c04 Don't use level random in entity constructors (#8122)
PaperMC/Paper@1a8bea7 Fix wrong world being passed into portal event (#8174)
This commit is contained in:
BillyGalbreath
2022-07-22 20:52:13 -05:00
parent 697c83e324
commit a60a01188e
11 changed files with 30 additions and 30 deletions

View File

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index ddf1fc47c3d01ec589548081ca9f01f8d6ccd642..2464e334de7e7f2d09e41b6b457a731239505db8 100644
index 979e81017d3bd0e0309e1fef6b62e3524f536a12..4b61032c838b4ada71e097efcc8bf4de311d7244 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4593,5 +4593,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4601,5 +4601,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean canSaveToDisk() {
return true;
}
@@ -351,7 +351,7 @@ index f2900d76e9577c83be377500f7d7e7f438a56683..0748babe61be5e5082132af6c4a3bc82
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 2890ca4d1886cf1e259fd7e7e8bab7ca33036e53..df3ea1aa8c4cfc9ed575e264d4eb851ae9f5b615 100644
index 3c3c9578f511987f8c237306647d04e8b57099e1..061d24461782e2ab76c3406f77a33f9f508f02cb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -203,6 +203,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {