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@ebaca20 Added getHostname to AsyncPlayerPreLoginEvent (#6656)
PaperMC/Paper@0c64d40 Updated Upstream (Bukkit/CraftBukkit) (#7323)
PaperMC/Paper@6663747 Some block state hunks were in the wrong patch (#7308)
PaperMC/Paper@78999b5 Remove redundant getRemoteAddress that can cause an NPE (#7331)
This commit is contained in:
BillyGalbreath
2022-01-13 22:06:23 -06:00
parent 9723e945ab
commit cb1a6366bf
18 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,7 @@ index 500a4013ce525c0474fe3991457d4c2a50ceb7ed..74de26d72e705041318beee0ebef59d6
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 f79cd24ce66fa7ea79308912a1696b3ca9bdffba..f16635e4dde9cabf905d450d39c7f84f338b70ad 100644
index c2581fb017f6579e59bd25e46b781aa95985abb2..e888e630176f30d773155019fb17aed8095538a1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -562,6 +562,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -93,10 +93,10 @@ index f79cd24ce66fa7ea79308912a1696b3ca9bdffba..f16635e4dde9cabf905d450d39c7f84f
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 29d8a6f8e8278d8d43f63761443dc47933af263b..8c0eda7a974d99565d7ca55dc8e35c98103ac714 100644
index 5c5e76b39f941f3921f36e86fd993d0af24ee922..0efb32d028df885f03b95f80b5da46ae7adb8257 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -967,6 +967,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -981,6 +981,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle()) {