Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ea0b639 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9228)
PaperMC/Paper@2eda177 Expand PlayerItemMendEvent (#7382)
PaperMC/Paper@bacbf86 Fixes and additions to projectile API (#9237)
PaperMC/Paper@8a18fc5 [ci skip] add 'needs triage' label to invalid on issue close (#9252)
PaperMC/Paper@d8d3bd7 [ci skip] Add missing deprecations for legacy MaterialData api (#9253)
This commit is contained in:
granny
2023-06-04 00:18:33 -07:00
parent d6cfa8f939
commit 6d7bb23341
37 changed files with 114 additions and 114 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index fcaeeb8885e20cc8de51831b4fbfe827e5cc94a1..489b124bcc7bd60830415563329f3567988ccf9b 100644
index 22656eea7e7d6b5e1f749db2f2209e5b8c362490..d1d2c0ea830fc3e4b5ac1be59a70fd551ad8c9b3 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2941,7 +2941,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2942,7 +2942,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public void handleInsidePortal(BlockPos pos) {
if (this.isOnPortalCooldown()) {
this.setPortalCooldown();
@@ -17,7 +17,7 @@ index fcaeeb8885e20cc8de51831b4fbfe827e5cc94a1..489b124bcc7bd60830415563329f3567
if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
this.portalEntrancePos = pos.immutable();
}
@@ -3633,7 +3633,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3634,7 +3634,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean canChangeDimensions() {