Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00: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@046466f Re-arrange most chunk system patches to front (#8338)
PaperMC/Paper@e8c2c3b Fix World#refreshChunk not working for chunks in no-tick range
This commit is contained in:
BillyGalbreath
2022-09-01 21:51:05 -05:00
parent be681220d6
commit ff8e329e9d
29 changed files with 160 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0132-Add-EntityTeleportHinderedEvent.patch
View File

@@ -78,10 +78,10 @@ index 5c7e30eb5e8a2a1ab18750a2cd2ec7364e8c52e0..ecd0ba252feb57cb1d60745e7750a676
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 11d51beb52c326a9fc040322a79d3916a8ddd0a2..240d7cfc0c5f5e3d3c53388f034a1b1faf9a4dfe 100644
index 18e0b4d9a4ba8189e6b431c52f46bbc461386f58..7bbddc36be634744c98a4ce1d1e71f2691af4535 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -593,6 +593,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -562,6 +562,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// Paper end
if ((!ignorePassengers && this.entity.isVehicle()) || this.entity.isRemoved()) { // Paper - Teleport passenger API
@@ -93,10 +93,10 @@ index 11d51beb52c326a9fc040322a79d3916a8ddd0a2..240d7cfc0c5f5e3d3c53388f034a1b1f
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6cb6f091d83f02a8e19261ffd4986336d996ba84..e98b1512de9fa68ced782fdd8455434a213931e6 100644
index 55c558197e7d940b2169b26c07ce7259bd8fac74..7b650a3e340a73ed865b5b8afe1aef2607e5c33b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1265,6 +1265,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1255,6 +1255,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API