Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47:43 +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@cc0f25cb Apply more feature patches
PaperMC/Paper@e7b684ed fix
PaperMC/Paper@71ccae07 Revert "move block data/state impl"
PaperMC/Paper@7612b5d0 Add identifier comparator for Plugin tickets
PaperMC/Paper@35b466e3 Add support for getting data components from entities
PaperMC/Paper@9f50f858 patch
PaperMC/Paper@42623c4b no patch
This commit is contained in:
granny
2025-04-05 20:54:04 -07:00
parent b81ab42440
commit 54283ad076
28 changed files with 117 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
purpur-server/paper-patches/features/0005-Add-EntityTeleportHinderedEvent.patch
View File

@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 67b9963afd91af84459d439697f6230fd67722b4..d8ed459b49624180e6939d9c5eefb453296f0559 100644
index 483062dbf8706dcf736ddb9393ccb696972be943..eefb5921752c1ef95255174f26e909c3e1b3e4ac 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -264,6 +264,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -267,6 +267,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
boolean retainPassengers = flagSet.contains(io.papermc.paper.entity.TeleportFlag.EntityState.RETAIN_PASSENGERS);
// Don't allow teleporting between worlds while keeping passengers
if (flagSet.contains(io.papermc.paper.entity.TeleportFlag.EntityState.RETAIN_PASSENGERS) && this.entity.isVehicle() && location.getWorld() != this.getWorld()) {
@@ -29,7 +29,7 @@ index 67b9963afd91af84459d439697f6230fd67722b4..d8ed459b49624180e6939d9c5eefb453
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index caa156cd56605f74888df6f64d7be310fd384f09..f4676ec9ab14d748c820169467a03fc5d1230302 100644
index c659ef8f5bd96fb5767a22b80e5b7e284401fa51..a5cf4e4b9cc35bd81b530bc3eac31b0af3d72b7c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1421,6 +1421,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {