Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@52a60ad Updated Upstream (Bukkit/CraftBukkit) (#8172)
PaperMC/Paper@5deafd1 Teleportation API (#6562)
This commit is contained in:
BillyGalbreath
2022-07-22 16:44:39 -05:00
parent 028780d4e1
commit 9a15789561
27 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0134-Add-EntityTeleportHinderedEvent.patch
View File

@@ -78,13 +78,13 @@ index 5c7e30eb5e8a2a1ab18750a2cd2ec7364e8c52e0..ecd0ba252feb57cb1d60745e7750a676
blockEntity.teleportCooldown = 100;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 158e1a61e9cc2661a09f6c4edb7db16464ca2e6d..2890ca4d1886cf1e259fd7e7e8bab7ca33036e53 100644
index b8cb317246b1f07c193abac9b5c84acdfe9ef958..3c3c9578f511987f8c237306647d04e8b57099e1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -575,6 +575,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
location.checkFinite();
@@ -593,6 +593,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// Paper end
if (this.entity.isVehicle() || this.entity.isRemoved()) {
if ((!ignorePassengers && this.entity.isVehicle()) || this.entity.isRemoved()) { // Paper - Teleport passenger API
+ // Purpur start
+ if (!entity.isRemoved() && new org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent(entity.getBukkitEntity(), org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent.Reason.IS_VEHICLE, cause).callEvent())
+ return teleport(location, cause);
@@ -93,13 +93,13 @@ index 158e1a61e9cc2661a09f6c4edb7db16464ca2e6d..2890ca4d1886cf1e259fd7e7e8bab7ca
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e8ec6547c11248a2bcc92bbd6226a264f3a51234..4487aef74152b0630a766293516135b3927cea7f 100644
index c852d5374bb7af1fd97b8d16a7fbea0a677fbad6..36ed9d6f513998c0183d19fdc3be17ad0413e613 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1158,6 +1158,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1237,6 +1237,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle()) {
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
+ // Purpur start
+ if (new org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent(entity.getBukkitEntity(), org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent.Reason.IS_VEHICLE, cause).callEvent())
+ return teleport(location, cause);