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

upstream

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 20:03:02 -04:00
parent 102b3130fe
commit 4f291c3b98
30 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ index 15c5cccfe02c924c02f605eb47dd0b420b189891..04bae5085756842ce88710646a17e9dc
ServerLevel worldserver = ((ServerLevel) world).getServer().getLevel(resourcekey);
diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
index 51f0dc173ddb29c6928badbc3c3a68ff3677a0e1..352568607e16be8f0e5942acd0097b4b2cf13bbc 100644
index 08a84e8fdb242f467fb20eec73764ef71691ad42..65fa00b3d4d35a4125f8de444e77ac54e9e28551 100644
--- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
@@ -86,7 +86,15 @@ public class NetherPortalBlock extends Block {
@@ -93,10 +93,10 @@ index 3cc9dab362141fdf61bdcd542ffa5e5c11f99e24..51325f67c49680417b8b843135ec0e91
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index eef64bca59a9b1558d83eb178e988d45281d4638..1948eda5fd4d6b8d8a9bdb8ee36fd9f12764525a 100644
index 6e061bf2951f0bd86364da3129f365799edda24c..3cc4f0020829ac935c325d5df7a16aabe26fe154 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1116,6 +1116,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1151,6 +1151,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle()) {