mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 01:17:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@afa16e6 Modify offline mode warning to include Velocity line (#8812) PaperMC/Paper@de38a45 Add projectile hit simulation API (#8816) PaperMC/Paper@7e7e6b4 More Win Screen API (#8805) PaperMC/Paper@bd77b78 Fix desync of honeycomb when the event is canceled (#8713) PaperMC/Paper@bb05fcf Add missing isFuel Material entries (#8843) PaperMC/Paper@8d1acf6 Call PlayerReadyArrowEvent for when items in the offhand are used (#8842) PaperMC/Paper@f2f9e8c Remove patch that was made obsolete by vanilla (#8847)
This commit is contained in:
@@ -93,10 +93,10 @@ index ba898640a8f693e8bae43281b170d3505154b273..39ae7bdac23601c567013799375bf32b
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index f157474b26ffea3c9ec5aa3f5c8a5f3c786a6bb5..e9dd10fcf1db1204f905ebeecfa0fccb83717205 100644
|
||||
index 81af78fcd88ca1fa00e206895093ee52772be502..465bec29cbaf3a1767a7171a69f0411054e63785 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1294,6 +1294,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1304,6 +1304,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
}
|
||||
|
||||
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
|
||||
|
||||
Reference in New Issue
Block a user