mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@6d0833ec Use target level for waypoint modify command (#12933) PaperMC/Paper@9694886d Fix endermite spawn position PaperMC/Paper@a664311f Fix AbstractArrow not setting noPhysics flag (#12935)
This commit is contained in:
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
|
|||||||
version = 1.21.8-R0.1-SNAPSHOT
|
version = 1.21.8-R0.1-SNAPSHOT
|
||||||
|
|
||||||
mcVersion = 1.21.8
|
mcVersion = 1.21.8
|
||||||
paperCommit = 846c64f4d1852aa0079978c72a71883fd5039ee8
|
paperCommit = a664311f0fb2643e45e2ef8aa7683af94f75ea14
|
||||||
|
|
||||||
org.gradle.configuration-cache = true
|
org.gradle.configuration-cache = true
|
||||||
org.gradle.caching = true
|
org.gradle.caching = true
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
|
--- a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
|
||||||
+++ b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
|
+++ b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
|
||||||
@@ -126,9 +_,10 @@
|
@@ -129,9 +_,10 @@
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
@@ -9,10 +9,10 @@
|
|||||||
Endermite endermite = EntityType.ENDERMITE.create(serverLevel, EntitySpawnReason.TRIGGERED);
|
Endermite endermite = EntityType.ENDERMITE.create(serverLevel, EntitySpawnReason.TRIGGERED);
|
||||||
if (endermite != null) {
|
if (endermite != null) {
|
||||||
+ endermite.setPlayerSpawned(true); // Purpur - Add back player spawned endermite API
|
+ endermite.setPlayerSpawned(true); // Purpur - Add back player spawned endermite API
|
||||||
endermite.snapTo(owner.getX(), owner.getY(), owner.getZ(), owner.getYRot(), owner.getXRot());
|
endermite.snapTo(preTeleportX, preTeleportY, preTeleportZ, preTeleportYRot, preTeleportXRot); // Paper - spawn endermite at pre teleport position as teleport has been moved up
|
||||||
serverLevel.addFreshEntity(endermite, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.ENDER_PEARL);
|
serverLevel.addFreshEntity(endermite, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.ENDER_PEARL);
|
||||||
}
|
}
|
||||||
@@ -148,7 +_,7 @@
|
@@ -151,7 +_,7 @@
|
||||||
if (serverPlayer1 != null) {
|
if (serverPlayer1 != null) {
|
||||||
serverPlayer1.resetFallDistance();
|
serverPlayer1.resetFallDistance();
|
||||||
serverPlayer1.resetCurrentImpulseContext();
|
serverPlayer1.resetCurrentImpulseContext();
|
||||||
|
|||||||
Reference in New Issue
Block a user