Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37: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@de04cbc Updated Upstream (Bukkit/CraftBukkit) (#10034)
This commit is contained in:
granny
2023-12-17 01:11:46 -08:00
parent 9e1216de50
commit eb3b67d5b2
30 changed files with 100 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0122-Add-EntityTeleportHinderedEvent.patch
View File

@@ -74,10 +74,10 @@ index 2e264b8b13df9da9163a80b3dd4345af3cff431c..7b27852682909b7d19942bbb517e6107
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 fed6671e518b2f1601bbf4154195a844fc3b0fd1..669405e0a38adc5336aa004011544346c44bc5bc 100644
index f8ac77be62ee1220e0373ade55fdee1cb32750e9..fb80b7e2edebf915a98ef608d5b2e27a6c9ae79c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -607,6 +607,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -252,6 +252,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// Paper end
if ((!ignorePassengers && this.entity.isVehicle()) || this.entity.isRemoved()) { // Paper - Teleport passenger API
@@ -89,10 +89,10 @@ index fed6671e518b2f1601bbf4154195a844fc3b0fd1..669405e0a38adc5336aa004011544346
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 54e2b4b116eadb1fdce15e4aee8e97d60fa2c8db..f4f6a04144139491f0b051dd33e256df5e3c368c 100644
index 72bd74a2fd6c9f7aec79ee7e4003cecbb4a3f95a..a7a702ccb7cab7d68758078927544f2928a5ea62 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1371,6 +1371,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1368,6 +1368,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API