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

Updated Upstream (Paper & Airplane)

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

Paper Changes:
06db5d08b0 Updated Upstream (Bukkit/CraftBukkit) (#6589)
810d200bb4 Improve interact distance check (#6591)

Airplane Changes:
8207533bdf Upstream
This commit is contained in:
William Blake Galbreath
2021-09-12 22:23:58 -05:00
parent acf2f845e4
commit 8bd08ceeea
53 changed files with 239 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,7 @@ index 09cbce5aec6eabfa220f7de81b492a180cb8ca1e..265770975ad1190283103b04cdd52a07
blockEntity.teleportCooldown = 100;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fd9ba48619b103071f9de669dea7d59bd2db2fee..6b02ac8a7ed8e4787abf017af23936718cee8d9c 100644
index c9fb98c7aacf0745ee5f008629ebfe2d117f664d..58812794be7c3676fa527cdeb8e48e243e73dffd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -383,6 +383,7 @@ public class PurpurWorldConfig {
@@ -113,10 +113,10 @@ index 7c51a6113bbf35f96693daf2988b6d59e53cbca1..9430d4e270cd5ebabeffde0e28f0a966
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c29ada6d77617e366248d5ba786394babbe9c6e3..02457e346b43f0ac76bb03f482d2a8bc7ef1d3af 100644
index f9d00b4bd00f8e0a7680a99e94d09fe2f311cbac..86cc5b5ef6bb8bfeaf9ee4436790f8f8e3faf018 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1008,6 +1008,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1009,6 +1009,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle()) {