mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 10:27:44 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@78feecb Deprecate BlockType#isInteractable (#11427) PaperMC/Paper@1cb2bf4 Add velocity forwarding secret env override (#10127) PaperMC/Paper@81d9448 Add ItemStack array serialization methods (#10387) PaperMC/Paper@2f50b87 Fixup command precprocess cancellation (#11424) PaperMC/Paper@540deb7 Fix Color Particle API (#10895) PaperMC/Paper@e8297c4 Expand out datapack API (#10828) PaperMC/Paper@4514c71 Only call EntityPortalExitEvent if entity is actually in a portal
This commit is contained in:
@@ -1073,7 +1073,7 @@ index a715ecf4a8ac91d3e5e5c6269d89e54b2c1cd279..223c3665126c576eddb1a8f7c9f5bc60
|
||||
};
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index eecb293535ac3c01026260f685a486a18e455185..1fd114c281cf79105ad232aac842bea6e808a5d2 100644
|
||||
index 6aeedfc6f2c98e7d05f5f01dcc905cc13de9afbd..1ed8cbed1c98053d868b242ee23012f8a7ce43a4 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -889,7 +889,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
@@ -1159,7 +1159,7 @@ index eecb293535ac3c01026260f685a486a18e455185..1fd114c281cf79105ad232aac842bea6
|
||||
} else if (this.portalProcess.hasExpired()) {
|
||||
this.portalProcess = null;
|
||||
}
|
||||
@@ -3825,7 +3825,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
@@ -3827,7 +3827,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1168,7 +1168,7 @@ index eecb293535ac3c01026260f685a486a18e455185..1fd114c281cf79105ad232aac842bea6
|
||||
Entity entity2 = worldserver1.dimension() == worldserver.dimension() ? this : this.getType().create(worldserver1);
|
||||
|
||||
if (entity2 != null) {
|
||||
@@ -3861,7 +3861,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
@@ -3863,7 +3863,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
teleportTarget.postDimensionTransition().onTransition(entity2);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user