Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47: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@93829bb Account for dimension type in portal void damage check (#9602)
PaperMC/Paper@a73ed95 Updated Upstream (CraftBukkit/Spigot) (#9598)
This commit is contained in:
granny
2023-08-13 22:51:10 -07:00
parent 1846bae1b6
commit aeecb71060
20 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0126-Add-EntityTeleportHinderedEvent.patch
View File

@@ -74,10 +74,10 @@ index 678c4527ddc7032a07e7d74cc160ddcb8810abbf..c370461d434005dc5394053713e039d9
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 7d744d5b6a9e593e657233b2192f2837bf360deb..98f7d917f8377927472414bee79d2de4269ec0bc 100644
index 489c6cf86508d3e143490bee02e6843a0cb42b86..604686e6a613e7674e0cf9bd3e54c46c6ed67d6b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -595,6 +595,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -601,6 +601,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,7 +89,7 @@ index 7d744d5b6a9e593e657233b2192f2837bf360deb..98f7d917f8377927472414bee79d2de4
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 4a775ffe8880c90def23e421fd3de17f9440f728..ee2ce224defb5174f112ab25d7f470e2ce02a605 100644
index e0094bc6aad713685840255cb036e8a9c905732e..c983872ee21ddf916e59ef50cff7d67b465374ee 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1347,6 +1347,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {