mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@5ffdff8 Fix a couple of bed bugs (#9112) PaperMC/Paper@e338793 Optimize hoppers by not trying to merge full items. (#9110) PaperMC/Paper@bd35d60 [ci-skip] Fix missing closing quote (#9126) PaperMC/Paper@8d040fa Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
@@ -89,10 +89,10 @@ index fa6938626c64ed17a2f56739d5801494ea6f3be1..df33bd0c97faa3c7eb4ab6cbe7286f6a
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 8164cb0e40057c05fafdfe036a64ce4da2b9bbbd..9960e185a77c5084dae4d92bb83d5fa2d742b48d 100644
|
||||
index c7fcf3da9ebfe139dd1777c17d5c62a9b9d5e039..1d47586b7301e883ff76876359534d71a684f3d6 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1365,6 +1365,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1364,6 +1364,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
}
|
||||
|
||||
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
|
||||
|
||||
Reference in New Issue
Block a user